projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 7a74d04) | patch
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)
committerJunio C Hamano <gitster@pobox.com>
Sat, 21 May 2011 18:57:14 +0000 (11:57 -0700)
commit865207a6dd9f7cc0c0941798b6ab4115b14f97a7
treeb1f958870a3c8d85a114cbb91f0554f513ef1aa6tree | snapshot
parent7a74d04a46eaa24aaea8080178520266d716e5adcommit | diff
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>
git-am.sh diff | blob | history
Git—the stupid content tracker