summaryrefslogtreecommitdiffstats
path: root/usr.sbin/mergemaster
diff options
context:
space:
mode:
authordougb <dougb@FreeBSD.org>2002-05-28 07:25:44 +0000
committerdougb <dougb@FreeBSD.org>2002-05-28 07:25:44 +0000
commit8bde8166eeb1bb527e2b1bc83fa61ddda18ae217 (patch)
treeb113b159b7734a70c5a1a38e802eef07b606b3a5 /usr.sbin/mergemaster
parent35f5a040c88247a639d400c49b78f35ac36aade8 (diff)
downloadFreeBSD-src-8bde8166eeb1bb527e2b1bc83fa61ddda18ae217.zip
FreeBSD-src-8bde8166eeb1bb527e2b1bc83fa61ddda18ae217.tar.gz
Actually accept the default argument to SCREEN_WIDTH.
Submitted by: brian
Diffstat (limited to 'usr.sbin/mergemaster')
-rwxr-xr-xusr.sbin/mergemaster/mergemaster.sh3
1 files changed, 3 insertions, 0 deletions
diff --git a/usr.sbin/mergemaster/mergemaster.sh b/usr.sbin/mergemaster/mergemaster.sh
index dc4ea90..7b963b4 100755
--- a/usr.sbin/mergemaster/mergemaster.sh
+++ b/usr.sbin/mergemaster/mergemaster.sh
@@ -379,6 +379,9 @@ if [ -t 0 ]; then
echo ''
echo -n "What would you like to use? [${w}] "
read SCREEN_WIDTH
+ case "${SCREEN_WIDTH}" in
+ '') SCREEN_WIDTH="${w}" ;;
+ esac
;;
esac
esac
OpenPOWER on IntegriCloud