5 # Directory to archive replaced configs
6 archive-dir=/etc/config-archive
8 # Use rcs for storing files in the archive directory?
15 # If using colordiff instead of diff, the less -R option may be required
16 # for correct display.
17 diff="diff -Nu '%s' '%s' | less --no-init --QUIT-AT-EOF"
19 # Diff for interactive merges.
23 merge="sdiff --suppress-common-lines --output='%s' '%s' '%s'"
25 # Automerge files comprising only CVS interpolations (e.g. Header or Id)
29 # Automerge files comprising only whitespace and/or comments
33 # Automerge files that the user hasn't modified
37 # Ignore a version that is identical to the previously merged version,
38 # even though it is different from the current user modified version
39 # Note that emerge already has a similar feature enabled by default,
40 # which can be disabled by the emerge --noconfmem option.
42 ignore-previously-merged=no
44 # Per-session log file of changes made to configuration files
45 #log-file=/var/log/dispatch-conf.log
47 # List of frozen files for which dispatch-conf will automatically zap updates