projects
/
portage.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
50ad510
)
include filename in submenu so we know exactly what we are working on
author
Mike Frysinger
<vapier@gentoo.org>
Tue, 22 Aug 2006 17:15:09 +0000
(17:15 -0000)
committer
Mike Frysinger
<vapier@gentoo.org>
Tue, 22 Aug 2006 17:15:09 +0000
(17:15 -0000)
svn path=/main/trunk/; revision=4320
bin/etc-update
patch
|
blob
|
history
diff --git
a/bin/etc-update
b/bin/etc-update
index bd1180b95fa9897c6bfc9a378993fa29006df7c8..7adf03ef305f9d244e8ff40ed30ab3e7ff3e37a2 100755
(executable)
--- a/
bin/etc-update
+++ b/
bin/etc-update
@@
-298,7
+298,8
@@
function do_cfg() {
echo "-------------------------------------------------------------"
echo
fi
- echo -n "1) Replace original with update
+ echo -n "File: ${file}
+1) Replace original with update
2) Delete update, keeping original as is
3) Interactively merge original with update
4) Show differences again