aboutsummaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
Diffstat (limited to 'config')
-rw-r--r--config/khard/khard.conf2
1 files changed, 1 insertions, 1 deletions
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