diff options
Diffstat (limited to 'cnf/etc-update.conf')
| -rw-r--r-- | cnf/etc-update.conf | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/cnf/etc-update.conf b/cnf/etc-update.conf index 379dd1636..74047b030 100644 --- a/cnf/etc-update.conf +++ b/cnf/etc-update.conf @@ -21,12 +21,17 @@ cp_opts="-i" pager="less" #pager="" +# For emacs-users bug #86067 +# diff_command="eval emacs -nw --eval=\(ediff\ \"%file1\"\ \"%file2\"\)" +#using_editor=1 + # vim-users: you CAN use vimdiff for diff_command. (see NOTE_1) -diff_command="diff -uN %file1 %file2" -using_editor=0 #diff_command="vim -d %file1 %file2" #using_editor=1 +diff_command="diff -uN %file1 %file2" +using_editor=0 + # vim-users: don't use vimdiff for merging (see NOTE_1) merge_command="sdiff -s -o %merged %orig %new" @@ -68,4 +73,3 @@ merge_command="sdiff -s -o %merged %orig %new" # choose while using those programs) # NOTE_2: Make sure pager is set to "" when using an editor as diff_command! - |