![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | |
| Tue, 22 Feb 2011 23:41:59 +0000 (23:41 +0000) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 10 Mar 2011 07:52:55 +0000 (23:52 -0800) | ||
| commit | bacec4784598ca35b9be7635cbb630ef59367b6b | |
| tree | f49872824d9b9ea390b4a8c48ace6ffaaa8555be | tree | snapshot |
| parent | f338cb83a0328b9fe4ec37dff0d4dcc3b8f3cde9 | commit | diff |
i18n: git-merge basic messages
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| builtin/merge.c | diff | blob | history | |
| t/t7607-merge-overwrite.sh | diff | blob | history | |
| t/t7611-merge-abort.sh | diff | blob | history |