Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
i18n: git-am "Falling back" say message
author
Ævar Arnfjörð Bjarmason
<avarab@gmail.com>
Sat, 21 May 2011 18:43:51 +0000
(18:43 +0000)
committer
Junio C Hamano
<gitster@pobox.com>
Sat, 21 May 2011 18:57:14 +0000
(11:57 -0700)
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>
git-am.sh
patch
|
blob
|
history
raw
|
patch
| inline |
side by side
(parent:
7a74d04
)
diff --git
a/git-am.sh
b/git-am.sh
index e1917543e4a41e44491a6b3c1eb374f3d2975a8f..a0db15e6bbe53da0e9c2a275163e40b64c537b7e 100755
(executable)
--- 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