summaryrefslogtreecommitdiff
path: root/git-am.sh
diff options
context:
space:
mode:
authorÆvar Arnfjörð Bjarmason <avarab@gmail.com>2011-05-21 18:43:51 +0000
committerJunio C Hamano <gitster@pobox.com>2011-05-21 11:57:14 -0700
commit865207a6dd9f7cc0c0941798b6ab4115b14f97a7 (patch)
treeb1f958870a3c8d85a114cbb91f0554f513ef1aa6 /git-am.sh
parent7a74d04a46eaa24aaea8080178520266d716e5ad (diff)
downloadgit-865207a6dd9f7cc0c0941798b6ab4115b14f97a7.tar.gz
i18n: git-am "Falling back" say message
Make the "Falling back to patching base and 3-way merge..." message used by fall_back_3way() translatable. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-am.sh')
-rwxr-xr-xgit-am.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-am.sh b/git-am.sh
index e1917543e4..a0db15e6bb 100755
--- a/git-am.sh
+++ b/git-am.sh
@@ -151,7 +151,7 @@ It does not apply to blobs recorded in its index.")"
orig_tree=$(cat "$dotest/patch-merge-base") &&
rm -fr "$dotest"/patch-merge-* || exit 1
- say Falling back to patching base and 3-way merge...
+ say "$(gettext "Falling back to patching base and 3-way merge...")"
# This is not so wrong. Depending on which base we picked,
# orig_tree may be wildly different from ours, but his_tree