diff options
| author | Zac Medico <zmedico@gentoo.org> | 2010-12-01 16:28:42 -0800 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-12-01 16:28:42 -0800 |
| commit | 95a80e3fe825245634286590fefe08a1a8902378 (patch) | |
| tree | 48fb10b0d976e613bb3957bb1e3867193e2b68a8 | |
| parent | a4976af2dc54db01a0c094e021ed8a776969c878 (diff) | |
| download | portage-95a80e3fe825245634286590fefe08a1a8902378.tar.gz portage-95a80e3fe825245634286590fefe08a1a8902378.tar.bz2 portage-95a80e3fe825245634286590fefe08a1a8902378.zip | |
Add note about colordiff and less -R.
| -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 |