VA
/
virtual-appliance
1
0
Fork 0
Code Issues Pull Requests Releases 6 Wiki Activity

Update etc-update.conf.

This commit is contained in:
Albert Hopkins 2013-02-14 15:04:07 +00:00
parent 278c69c8f6
commit eaba7419f5
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
etc-update.conf
View File

@ -5,6 +5,10 @@
# note that you need dev-util/dialog installed # note that you need dev-util/dialog installed
mode="0" mode="0"
# Whether to clear the term prior to each display
#clear_term="yes"
clear_term="no"
# Whether trivial/comment changes should be automerged # Whether trivial/comment changes should be automerged
eu_automerge="yes" eu_automerge="yes"
@ -17,8 +21,9 @@ mv_opts=""
# arguments used whenever cp is called # arguments used whenever cp is called
cp_opts="" cp_opts=""
# pager for use with diff commands # set the pager for use with diff commands (this will
#pager="" # cause the PAGER environment variable to be ignored)
#pager="less"
# For emacs-users (see NOTE_2) # For emacs-users (see NOTE_2)
# diff_command="eval emacs -nw --eval=\'\(ediff\ \"%file1\"\ \"%file2\"\)\'" # diff_command="eval emacs -nw --eval=\'\(ediff\ \"%file1\"\ \"%file2\"\)\'"
@ -28,6 +33,8 @@ cp_opts=""
#diff_command="vim -d %file1 %file2" #diff_command="vim -d %file1 %file2"
#using_editor=1 #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" diff_command="diff -uN %file1 %file2"
using_editor=0 using_editor=0
@ -40,9 +47,9 @@ merge_command="sdiff -s -o %merged %orig %new"
# pager: # pager:
# #
# Examples of pager usage: # Examples of pager usage:
# pager="" # don't use a pager # pager="cat" # don't use a pager
# pager="less -E" # less # pager="less -E" # less
# pager="more" # more # pager="more" # more
# #
# #
# diff_command: # diff_command: