diff options
author | Jason Stubbs <jstubbs@gentoo.org> | 2005-08-28 08:37:44 +0000 |
---|---|---|
committer | Jason Stubbs <jstubbs@gentoo.org> | 2005-08-28 08:37:44 +0000 |
commit | d9fc4acc572c6647a4f27b838d35d27d805d190e (patch) | |
tree | 262a8de35d8c7567312757da5f1f66efdc8cece5 /cnf/dispatch-conf.conf | |
download | portage-d9fc4acc572c6647a4f27b838d35d27d805d190e.tar.gz portage-d9fc4acc572c6647a4f27b838d35d27d805d190e.tar.bz2 portage-d9fc4acc572c6647a4f27b838d35d27d805d190e.zip |
Migration (without history) of the current stable line to subversion.
svn path=/main/branches/2.0/; revision=1941
Diffstat (limited to 'cnf/dispatch-conf.conf')
-rw-r--r-- | cnf/dispatch-conf.conf | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/cnf/dispatch-conf.conf b/cnf/dispatch-conf.conf new file mode 100644 index 000000000..11123b2a8 --- /dev/null +++ b/cnf/dispatch-conf.conf @@ -0,0 +1,36 @@ +# +# 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 |