Sophie

Sophie

distrib > Mageia > 5 > i586 > by-pkgid > d916e7eba4e01931799ee6711c4a0d1a > files > 1

etc-update-20020731-17.mga5.noarch.rpm

# Copyright 2002 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License, v2 or later
# Authors: (C) Jochem Kossen 2002, (C) Leo Lipelis 2002
#
# This is a configuration file for the etc-update command. Edit it to suit your
# needs
#

# arguments used whenever rm is called
rm_opts="-f"

# arguments used whenever mv is called
mv_opts="-f"

# arguments used whenever cp is called
cp_opts="-i"

# pager for use with diff commands (see NOTE_2)
#pager="less -E"
pager="more"

# vim-users: you CAN use vimdiff for diff_command. (see NOTE_1)
diff_command="diff -uN %file1 %file2"
#diff_command="vim -d %file1 %file2"

# vim-users: don't use vimdiff for merging (see NOTE_1)
merge_command="sdiff -s -o %merged %orig %new"
merge_helpmessage="Press ? for help."

# EXPLANATION
#
# pager:
#
# Examples of pager usage:
#   pager=""        # don't use a pager
#   pager="less -E" # less
#   pager="more"    # more
#
#
# diff_command:
#
# Arguments:
#   %file1  [REQUIRED]
#   %file2  [REQUIRED]
#
# Examples of diff_command:
#   diff_command="diff -uN %file1 %file2"   # diff
#   diff_command="vim -d %file1 %file2"     # vimdiff
#
#
# merge_command:
#
# Arguments:
#   %orig   [REQUIRED]
#   %new    [REQUIRED]
#   %merged [REQUIRED]
#
# Examples of merge_command:
#   merge_command="sdiff -s -o %merged %old %new"   # sdiff
#

# NOTE_1: Editors such as vim/vimdiff are not usable for the merge_command
# because it is not known what filenames the produced files have (the user can
# choose while using those programs)

# NOTE_2: Make sure pager is set to "" when using an editor as diff_command!