# edit the lines below to your liking # $Id: /var/cvsroot/gentoo-src/portage/cnf/etc-update.conf,v 1.5.2.1 2004/10/22 16:53:30 carpaski Exp $ # mode - 0 for text, 1 for menu (support incomplete) # note that you need dev-util/dialog installed mode="0" # Whether trivial/comment changes should be automerged eu_automerge="yes" # arguments used whenever rm is called rm_opts="-i" # arguments used whenever mv is called mv_opts="-i" # arguments used whenever cp is called cp_opts="-i" # pager for use with diff commands (see NOTE_2) pager="less" #pager="" # For emacs-users # diff_command="eval emacs -nw --eval=\(ediff\ \"%file1\"\ \"%file2\"\)" #using_editor=1 # vim-users: you CAN use vimdiff for diff_command. (see NOTE_1) #diff_command="vim -d %file1 %file2" #using_editor=1 diff_command="diff -uN %file1 %file2" using_editor=0 # vim-users: don't use vimdiff for merging (see NOTE_1) merge_command="sdiff -s -o %merged %orig %new" # EXPLANATION # # pager: # # Examples of pager usage: # pager="" # don't use a pager # pager="less -E" # less # pager="more" # more # # # diff_command: # # Arguments: # %file1 [REQUIRED] # %file2 [REQUIRED] # # Examples of diff_command: # diff_command="diff -uN %file1 %file2" # diff # diff_command="vim -d %file1 %file2" # vimdiff # # # merge_command: # # Arguments: # %orig [REQUIRED] # %new [REQUIRED] # %merged [REQUIRED] # # Examples of merge_command: # merge_command="sdiff -s -o %merged %old %new" # sdiff # # NOTE_1: Editors such as vim/vimdiff are not usable for the merge_command # because it is not known what filenames the produced files have (the user can # choose while using those programs) # NOTE_2: Make sure pager is set to "" when using an editor as diff_command!