From eaba7419f5ec888c8803fd7d38dba6a2fb26f420 Mon Sep 17 00:00:00 2001 From: Albert Hopkins Date: Thu, 14 Feb 2013 15:04:07 +0000 Subject: [PATCH] Update etc-update.conf. --- etc-update.conf | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/etc-update.conf b/etc-update.conf index 1e25704..5ba358c 100644 --- a/etc-update.conf +++ b/etc-update.conf @@ -5,6 +5,10 @@ # note that you need dev-util/dialog installed mode="0" +# Whether to clear the term prior to each display +#clear_term="yes" +clear_term="no" + # Whether trivial/comment changes should be automerged eu_automerge="yes" @@ -17,8 +21,9 @@ mv_opts="" # arguments used whenever cp is called cp_opts="" -# pager for use with diff commands -#pager="" +# set the pager for use with diff commands (this will +# cause the PAGER environment variable to be ignored) +#pager="less" # For emacs-users (see NOTE_2) # diff_command="eval emacs -nw --eval=\'\(ediff\ \"%file1\"\ \"%file2\"\)\'" @@ -28,6 +33,8 @@ cp_opts="" #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 @@ -40,9 +47,9 @@ merge_command="sdiff -s -o %merged %orig %new" # pager: # # Examples of pager usage: -# pager="" # don't use a pager -# pager="less -E" # less -# pager="more" # more +# pager="cat" # don't use a pager +# pager="less -E" # less +# pager="more" # more # # # diff_command: