[PATCH v2 10/48] i18n: git-am "Falling back" say message
From: Ævar Arnfjörð Bjarmason <hidden>
Date: 2016-06-15 22:51:17
Subsystem:
the rest · Maintainer:
Linus Torvalds
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 <redacted> --- git-am.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/git-am.sh b/git-am.sh
index e5edb55..aa52b51 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
--
1.7.5.1