projects
/
portage.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
589c712
)
Update NOTE_2 to document proper use of the using_editor
author
Zac Medico
<zmedico@gentoo.org>
Mon, 15 Oct 2007 19:30:27 +0000
(19:30 -0000)
committer
Zac Medico
<zmedico@gentoo.org>
Mon, 15 Oct 2007 19:30:27 +0000
(19:30 -0000)
config option. (trunk r8136)
svn path=/main/branches/2.1.2/; revision=8137
cnf/etc-update.conf
patch
|
blob
|
history
diff --git
a/cnf/etc-update.conf
b/cnf/etc-update.conf
index 12396b3b4bf6b42116ab4193baccd582109438bc..cfafff4f74c22eec7acfef0aa897b83174bec174 100644
(file)
--- a/
cnf/etc-update.conf
+++ b/
cnf/etc-update.conf
@@
-72,4
+72,5
@@
merge_command="sdiff -s -o %merged %orig %new"
# 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!
+# NOTE_2: Make sure using_editor is set to "1" when using an editor as
+# diff_command!