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>
Ævar Arnfjörð Bjarmason committed
May 21, 2011 at 18:43 UTC
865207a6dd9f7cc0c0941798b6ab4115b14f97a7
1 file changed
+1
-1
git-am.sh
+1
-1
@@ -151,7 +151,7 @@ It does not apply to blobs recorded in its index.")"
151
orig_tree=$(cat "$dotest/patch-merge-base") &&
152
rm -fr "$dotest"/patch-merge-* || exit 1
153
154
- say Falling back to patching base and 3-way merge...
154
+ say "$(gettext "Falling back to patching base and 3-way merge...")"
155
156
# This is not so wrong. Depending on which base we picked,
157
# orig_tree may be wildly different from ours, but his_tree