diff options
Diffstat (limited to 'cnf/dispatch-conf.conf')
| -rw-r--r-- | cnf/dispatch-conf.conf | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/cnf/dispatch-conf.conf b/cnf/dispatch-conf.conf index b51b61ae1..c4ab33f99 100644 --- a/cnf/dispatch-conf.conf +++ b/cnf/dispatch-conf.conf @@ -22,7 +22,15 @@ use-rcs=no # %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="diff -Nu '%s' '%s'" + +# Set the pager for use with diff commands (this will +# cause the PAGER environment variable to be ignored). +# Setting pager="cat" will disable pager usage. +pager="" + +# Default options used if less is the pager +less-opts="--no-init --QUIT-AT-EOF" # Diff for interactive merges. # %s output file |