diff options
Diffstat (limited to 'cnf')
| -rw-r--r-- | cnf/dispatch-conf.conf | 2 | ||||
| -rw-r--r-- | cnf/etc-update.conf | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/cnf/dispatch-conf.conf b/cnf/dispatch-conf.conf index 4fed03282..33ad156e6 100644 --- a/cnf/dispatch-conf.conf +++ b/cnf/dispatch-conf.conf @@ -12,6 +12,8 @@ use-rcs=no # Diff for display # %s old file # %s new file +# If using colordiff instead of diff, the less -R option may be required +# for correct display. diff="diff -Nu '%s' '%s' | less --no-init --QUIT-AT-EOF" # Diff for interactive merges. diff --git a/cnf/etc-update.conf b/cnf/etc-update.conf index fcb4f582b..8157c3dc7 100644 --- a/cnf/etc-update.conf +++ b/cnf/etc-update.conf @@ -29,6 +29,8 @@ pager="less" #diff_command="vim -d %file1 %file2" #using_editor=1 +# If using colordiff instead of diff, the less -R option may be required +# for correct display (see 'pager' setting above). diff_command="diff -uN %file1 %file2" using_editor=0 |