5 # Directory to archive replaced configs
6 archive-dir=/etc/config-archive
8 # Use rcs for storing files in the archive directory?
9 # WARNING: When configured to use rcs, read and execute permissions of
10 # archived files may be inherited from the first check in of a working
11 # file, as documented in the ci(1) man page. This means that even if
12 # the permissions of the working file have since changed, the older
13 # permissions of the first check in may be inherited. As mentioned in
14 # the ci(1) man page, users can control access to RCS files by setting
15 # the permissions of the directory containing the files (see
23 # If using colordiff instead of diff, the less -R option may be required
24 # for correct display.
25 diff="diff -Nu '%s' '%s' | less --no-init --QUIT-AT-EOF"
27 # Diff for interactive merges.
31 merge="sdiff --suppress-common-lines --output='%s' '%s' '%s'"
33 # Automerge files comprising only CVS interpolations (e.g. Header or Id)
37 # Automerge files comprising only whitespace and/or comments
41 # Automerge files that the user hasn't modified
45 # Ignore a version that is identical to the previously merged version,
46 # even though it is different from the current user modified version
47 # Note that emerge already has a similar feature enabled by default,
48 # which can be disabled by the emerge --noconfmem option.
50 ignore-previously-merged=no
52 # Per-session log file of changes made to configuration files
53 #log-file=/var/log/dispatch-conf.log
55 # List of frozen files for which dispatch-conf will automatically zap updates