summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Allen <david.a58@optusnet.com.au>2017-11-08 21:59:11 -0600
committerRobby Workman <rworkman@slackware.com>2017-11-08 22:01:22 -0600
commitc73041dff21196afd84d99925b260bfd3f18f8f9 (patch)
treee496ab38dc5ef5b43ad0088f49d3e530799267d2
parent569b7a2548b71d5985e5cfac42a5f45e334d7ff2 (diff)
downloadslackpkg-c73041dff21196afd84d99925b260bfd3f18f8f9.tar.xz
post-functions.sh: Fix vimdiff patch
** This was my mistake; my mail client munged the patch, so I had to apply it all by hand. The extra (old) line of 'showmenu' options was what I'd copied to compare the new options, and I forgot to delete it when committing. Mea culpa. --rworkman
-rw-r--r--files/post-functions.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/files/post-functions.sh b/files/post-functions.sh
index 27f47c2..bb974b1 100644
--- a/files/post-functions.sh
+++ b/files/post-functions.sh
@@ -178,7 +178,7 @@ What do you want (K/O/R/P)?"
GOEX=0
while [ $GOEX -eq 0 ]; do
echo
- showmenu $i "(K)eep" "(O)verwrite" "(R)emove" "(D)iff" "(M)erge" "(V)imdiff [dp put, do obtain, ^W^W switch]" showmenu $i "(K)eep" "(O)verwrite" "(R)emove" "(D)iff" "(M)erge"
+ showmenu $i "(K)eep" "(O)verwrite" "(R)emove" "(D)iff" "(M)erge" "(V)imdiff [dp put, do obtain, ^W^W switch]"
read ANSWER
case $ANSWER in
O|o)