mage-next/conf/etc-update.conf

# edit the lines below to your liking

# mode - 0 for text, 1 for menu (support incomplete)
# note that you need dev-util/dialog installed
mode="0"

# Whether trivial/comment changes should be automerged
eu_automerge="yes"

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

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

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

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

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


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

# 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!

1	niro	24	# edit the lines below to your liking
2
3			# mode - 0 for text, 1 for menu (support incomplete)
4			# note that you need dev-util/dialog installed
5			mode="0"
6
7			# Whether trivial/comment changes should be automerged
8			eu_automerge="yes"
9
10			# arguments used whenever rm is called
11			rm_opts="-i"
12
13			# arguments used whenever mv is called
14			mv_opts="-i"
15
16			# arguments used whenever cp is called
17			cp_opts="-i"
18
19			# pager for use with diff commands (see NOTE_2)
20			pager="less"
21			#pager=""
22
23			# vim-users: you CAN use vimdiff for diff_command. (see NOTE_1)
24			diff_command="diff -uN %file1 %file2"
25			using_editor=0
26			#diff_command="vim -d %file1 %file2"
27			#using_editor=1
28
29
30			# vim-users: don't use vimdiff for merging (see NOTE_1)
31			merge_command="sdiff -s -o %merged %orig %new"
32
33			# EXPLANATION
34			#
35			# pager:
36			#
37			# Examples of pager usage:
38			# pager="" # don't use a pager
39			# pager="less -E" # less
40			# pager="more" # more
41			#
42			#
43			# diff_command:
44			#
45			# Arguments:
46			# %file1 [REQUIRED]
47			# %file2 [REQUIRED]
48			#
49			# Examples of diff_command:
50			# diff_command="diff -uN %file1 %file2" # diff
51			# diff_command="vim -d %file1 %file2" # vimdiff
52			#
53			#
54			# merge_command:
55			#
56			# Arguments:
57			# %orig [REQUIRED]
58			# %new [REQUIRED]
59			# %merged [REQUIRED]
60			#
61			# Examples of merge_command:
62			# merge_command="sdiff -s -o %merged %old %new" # sdiff
63			#
64
65			# NOTE_1: Editors such as vim/vimdiff are not usable for the merge_command
66			# because it is not known what filenames the produced files have (the user can
67			# choose while using those programs)
68
69			# NOTE_2: Make sure pager is set to "" when using an editor as diff_command!
70