diff options
| author | Zac Medico <zmedico@gentoo.org> | 2010-12-01 16:28:42 -0800 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-12-03 22:27:39 -0800 |
| commit | 772c9df62ee7f874524dc6f7e8e89b9108fa5313 (patch) | |
| tree | 6a199412ffc09ab9ae5689e9ee50fbd6f39598ae /cnf/dispatch-conf.conf | |
| parent | d634d736e6cdafefa39bedf53f64113bea650ef9 (diff) | |
| download | portage-772c9df62ee7f874524dc6f7e8e89b9108fa5313.tar.gz portage-772c9df62ee7f874524dc6f7e8e89b9108fa5313.tar.bz2 portage-772c9df62ee7f874524dc6f7e8e89b9108fa5313.zip | |
Add note about colordiff and less -R.
Diffstat (limited to 'cnf/dispatch-conf.conf')
| -rw-r--r-- | cnf/dispatch-conf.conf | 2 |
1 files changed, 2 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. |