diff --git a/git-am.sh b/git-am.sh
index 6ed527c7a9c2d0bb9bbf84b2176b86ffc0670c93..39f255209e11283a0c3d402f215ff6c187922ea7 100755 (executable)
--- a/git-am.sh
+++ b/git-am.sh
#!/bin/sh
#
#
#!/bin/sh
#
#
-. git-sh-setup
-usage () {
- echo >&2 "usage: $0 [--signoff] [--dotest=<dir>] [--utf8] [--binary] [--3way] <mbox>"
- echo >&2 " or, when resuming"
- echo >&2 " $0 [--skip | --resolved]"
- exit 1;
-}
+USAGE='[--signoff] [--dotest=<dir>] [--utf8] [--binary] [--3way] <mbox>
+ or, when resuming [--skip | --resolved]'
+. git-sh-setup
stop_here () {
echo "$1" >"$dotest/next"
stop_here () {
echo "$1" >"$dotest/next"