git difftool

This commit is contained in:
Aborn Jiang 2016-11-07 23:53:48 +08:00
parent 02d3613918
commit f2d3a0d4c5
3 changed files with 5 additions and 2 deletions

1
sh.txt
View File

@ -1,4 +1,3 @@
14.902
14.401
1.301

3
shell/ediff.sh Executable file
View File

@ -0,0 +1,3 @@
#!/bin/bash
emacsclient -a "" -c -n --eval "(require 'ediff)" --eval "(ediff-files \"$1\" \"$2\")"

View File

@ -1,5 +1,6 @@
#!/usr/bin/env bash
# 常用操作命令
############################################
# grep的或操作查看当前打开的网络链接
lsof -i | grep -E "(LISTEN|ESTABLISHED)"