diff options
| -rwxr-xr-x | bin/ediff.sh | 3 | ||||
| -rw-r--r-- | config/khard/khard.conf | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/bin/ediff.sh b/bin/ediff.sh new file mode 100755 index 0000000..4115a90 --- /dev/null +++ b/bin/ediff.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +emacsclient -c --eval "(ediff \"$1\" \"$2\")" diff --git a/config/khard/khard.conf b/config/khard/khard.conf index 509c71b..7bf6197 100644 --- a/config/khard/khard.conf +++ b/config/khard/khard.conf @@ -12,7 +12,7 @@ debug = no default_action = list # These are either strings or comma seperated lists editor = emacsclient -merge_editor = vimdiff +merge_editor = ediff.sh [contact table] # display names by first or last name: first_name / last_name / formatted_name |