summaryrefslogtreecommitdiff
path: root/builtin/merge.c
diff options
context:
space:
mode:
authorÆvar Arnfjörð Bjarmason <avarab@gmail.com>2011-02-22 23:41:55 +0000
committerJunio C Hamano <gitster@pobox.com>2011-03-09 23:52:54 -0800
commit2fc5f9f189512b82f2154658079e9c3889d4c136 (patch)
treef4bd7876197d4ade3aeaa024c632be27b462bc9c /builtin/merge.c
parent321a153c5a85320505e6eee9acd3f87b79cd873a (diff)
downloadgit-2fc5f9f189512b82f2154658079e9c3889d4c136.tar.gz
i18n: git-grep basic messages
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge.c')
0 files changed, 0 insertions, 0 deletions