# $Header: /home/cvsroot/gentoo-src/portage/cnf/etc-update.conf,v 1.5 2003/04/28 10:19:46 carpaski Exp $ # last modified at 11-november-2003; Diederik van der Boor ###### Settings for etc-update; a tool to update the /etc/ files ## == Options mode="0" # 0 = text, 1 = menu eu_automerge=yes # Whether trivial/comment changes should be automerged ## == Commands rm_opts=-i # arguments for "rm" mv_opts=-i # arguments for "mv" cp_opts=-i # arguments for "cp" ## == Tools diff_command=vim -d %file1 %file2 # diff: vimdiff (default="diff -uN %file1 %file2") using_editor=1 # ??? pager="" # pager for $diff_command, see NOTE_2 (default="less") merge_command=sdiff -s -o %merged %orig %new # merge, see NOTE_1 # 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!