Merge branch 'jc/maint-diffstat-numstat-context' into maint

diff --git a/git-stash.sh b/git-stash.sh
index f4e6f05ee212f452a1b3e13c492960a9222029f7..31dec0abf13ee7d6ded313b24253cd12254f1685 100755 (executable)
--- a/git-stash.sh
+++ b/git-stash.sh
@@ -198,8 +198,8 @@ save_stash () {
                        #    $ git stash save --blah-blah 2>&1 | head -n 2
                        #    error: unknown option for 'stash save': --blah-blah
                        #           To provide a message, use git stash save -- '--blah-blah'
-                       eval_gettext "$("error: unknown option for 'stash save': \$option
-       To provide a message, use git stash save -- '\$option'")"; echo
+                       eval_gettextln "$("error: unknown option for 'stash save': \$option
+       To provide a message, use git stash save -- '\$option'")"
                        usage
                        ;;
                *)
@@ -470,10 +470,7 @@ apply_stash () {
                status=$?
                if test -n "$INDEX_OPTION"
                then
-                       (
-                               gettext "Index was not unstashed." &&
-                               echo
-                       ) >&2
+                       gettextln "Index was not unstashed." >&2
                fi
                exit $status
        fi