From 95a80e3fe825245634286590fefe08a1a8902378 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Wed, 1 Dec 2010 16:28:42 -0800 Subject: Add note about colordiff and less -R. --- cnf/dispatch-conf.conf | 2 ++ 1 file changed, 2 insertions(+) (limited to 'cnf/dispatch-conf.conf') 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. -- cgit v1.2.3-1-g7c22