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