![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| 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) | ||
| commit | 865207a6dd9f7cc0c0941798b6ab4115b14f97a7 | |
| tree | b1f958870a3c8d85a114cbb91f0554f513ef1aa6 | tree | snapshot |
| parent | 7a74d04a46eaa24aaea8080178520266d716e5ad | commit | 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>
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 |