# # dispatch-conf.conf # # Directory to archive replaced configs archive-dir=/etc/config-archive # Use rcs for storing files in the archive directory? # (yes or no) use-rcs=no # Diff for display # %s old file # %s new file diff="diff -Nu %s %s | less --no-init --QUIT-AT-EOF" # Diff for interactive merges. # %s output file # %s old file # %s new file merge="sdiff --suppress-common-lines --output=%s %s %s" # Automerge files comprising only CVS interpolations (e.g. Header or Id) # (yes or no) replace-cvs=yes # Automerge files comprising only whitespace and/or comments # (yes or no) replace-wscomments=no # Automerge files that the user hasn't modified # (yes or no) replace-unmodified=no # Per-session log file of changes made to configuration files #log-file=/var/log/dispatch-conf.log