From f2d3a0d4c56eec6a6d52648546fc6f00916568c1 Mon Sep 17 00:00:00 2001
From: Aborn Jiang <loveaborn@foxmail.com>
Date: Mon, 7 Nov 2016 23:53:48 +0800
Subject: [PATCH] git difftool

---
 sh.txt               | 1 -
 shell/ediff.sh       | 3 +++
 shell/freqCommand.sh | 3 ++-
 3 files changed, 5 insertions(+), 2 deletions(-)
 create mode 100755 shell/ediff.sh

diff --git a/sh.txt b/sh.txt
index f456f6e..f7c1ac1 100644
--- a/sh.txt
+++ b/sh.txt
@@ -1,4 +1,3 @@
-
 14.902
 14.401
 1.301
diff --git a/shell/ediff.sh b/shell/ediff.sh
new file mode 100755
index 0000000..f1c2798
--- /dev/null
+++ b/shell/ediff.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+emacsclient -a "" -c -n --eval "(require 'ediff)" --eval "(ediff-files \"$1\" \"$2\")"
diff --git a/shell/freqCommand.sh b/shell/freqCommand.sh
index 4773d89..faf63db 100644
--- a/shell/freqCommand.sh
+++ b/shell/freqCommand.sh
@@ -1,5 +1,6 @@
 #!/usr/bin/env bash
-
+# 常用操作命令
+############################################
 # grep的或操作，查看当前打开的网络链接
 lsof -i | grep -E "(LISTEN|ESTABLISHED)"