diff options
author | Oscar Najera <hi@oscarnajera.com> | 2024-04-06 20:05:03 +0200 |
---|---|---|
committer | Oscar Najera <hi@oscarnajera.com> | 2024-05-31 19:50:24 +0200 |
commit | 603cef5764fde722a35c69a1d0a499b385147caa (patch) | |
tree | 2b6069caee9507439758f7ffe0afd267cce663ca /config | |
parent | 6ab56c022056a6f8468973f3fd9266d8e63a80f5 (diff) | |
download | dotfiles-603cef5764fde722a35c69a1d0a499b385147caa.tar.gz dotfiles-603cef5764fde722a35c69a1d0a499b385147caa.tar.bz2 dotfiles-603cef5764fde722a35c69a1d0a499b385147caa.zip |
ediff cli
Diffstat (limited to 'config')
-rw-r--r-- | config/khard/khard.conf | 2 |
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 |