From 3b4f54403a1529985fca481d9252747f9877d542 Mon Sep 17 00:00:00 2001 From: Jason McIntyre Date: Tue, 12 May 2009 13:04:19 +0000 Subject: - tweak the description of -a - remove -SX from usage() ok ajacoutot --- usr.sbin/sysmerge/sysmerge.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'usr.sbin/sysmerge/sysmerge.sh') diff --git a/usr.sbin/sysmerge/sysmerge.sh b/usr.sbin/sysmerge/sysmerge.sh index d9bd10d4705..a60ece3f178 100644 --- a/usr.sbin/sysmerge/sysmerge.sh +++ b/usr.sbin/sysmerge/sysmerge.sh @@ -1,6 +1,6 @@ #!/bin/sh - # -# $OpenBSD: sysmerge.sh,v 1.40 2009/05/11 20:25:55 ajacoutot Exp $ +# $OpenBSD: sysmerge.sh,v 1.41 2009/05/12 13:04:18 jmc Exp $ # # This script is based on the FreeBSD mergemaster script, written by # Douglas Barton @@ -57,7 +57,7 @@ error_rm_wrkdir() { } usage() { - echo "usage: ${0##*/} [-ab] [-S etcXX.tgz] [-s src | etcXX.tgz] [-X xetcXX.tgz] [-x xetcXX.tgz]" >&2 + echo "usage: ${0##*/} [-ab] [-s src | etcXX.tgz] [-x xetcXX.tgz]" >&2 } trap "restore_bak; clean_src; rm -rf ${WRKDIR}; exit 1" 1 2 3 13 15 -- cgit v1.2.3