diff options
author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2011-05-21 18:43:51 +0000 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2011-05-21 11:57:14 -0700 |
commit | 865207a6dd9f7cc0c0941798b6ab4115b14f97a7 (patch) | |
tree | b1f958870a3c8d85a114cbb91f0554f513ef1aa6 /t/t9137-git-svn-dcommit-clobber-series.sh | |
parent | i18n: git-am "Apply?" message (diff) | |
download | tgif-865207a6dd9f7cc0c0941798b6ab4115b14f97a7.tar.xz |
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 't/t9137-git-svn-dcommit-clobber-series.sh')
0 files changed, 0 insertions, 0 deletions