aboutsummaryrefslogtreecommitdiff
path: root/DAV
diff options
context:
space:
mode:
Diffstat (limited to 'DAV')
-rw-r--r--DAV/khard.conf2
1 files changed, 1 insertions, 1 deletions
diff --git a/DAV/khard.conf b/DAV/khard.conf
index 76b0c32..4765558 100644
--- a/DAV/khard.conf
+++ b/DAV/khard.conf
@@ -9,7 +9,7 @@ path = ~/.contacts/default/
debug = no
default_action = list
editor = nvim
-merge_editor = vimdiff
+merge_editor = nvimdiff
[contact table]
# display names by first or last name: first_name / last_name