Signed-off-by: Jiang Xin worldhello@gmail.com
---
git-am.sh | 11 +--
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/git-am.sh b/git-am.sh
index b6a53..20c1a 100755
--- a/git-am.sh
+++ b/git-am.sh
@@ -92,7 +92,7 @@ safe_to_abort () {
then
return 0
fi
- gettextln You seem to have moved HEAD since the last 'am'
failure.
+ gettextln You seem to have moved HEAD since the last 'am' failure.
Not rewinding to ORIG_HEAD 2
return 1
}
@@ -136,7 +136,7 @@ fall_back_3way () {
git write-tree $dotest/patch-merge-base+ ||
cannot_fallback $(gettext Repository lacks necessary blobs to fall back
on 3-way merge.)
-say Using index info to reconstruct a base tree...
+say $(gettext Using index info to reconstruct a base tree...)
cmd='GIT_INDEX_FILE=$dotest/patch-merge-tmp-index'
@@ -176,8 +176,7 @@ It does not apply to blobs recorded in its index.)
fi
git-merge-recursive $orig_tree -- HEAD $his_tree || {
git rerere $allow_rerere_autoupdate
- echo Failed to merge in the changes.
- exit 1
+ die $(gettext Failed to merge in the changes.)
}
unset GITHEAD_$his_tree
}
@@ -387,8 +386,8 @@ do
-i|--interactive)
interactive=t ;;
-b|--binary)
- echo 2 The $1 option has been a no-op for long time, and
- echo 2 it will be removed. Please do not use it anymore.
+ echo 2 $(gettext The -b option has been a no-op for long
time, and
+it will be removed. Please do not use it anymore.)
;;
-3|--3way)
threeway=t ;;
--
1.7.11.2.259.g37fc0e1
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
