Skip to content

Commit

Permalink
i18n: git-merge basic messages
Browse files Browse the repository at this point in the history 
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
@avar @gitster
avar authored and gitster committed Mar 10, 2011
1 parent f338cb8 commit bacec47
Show file tree
Hide file tree
Showing 3 changed files with 86 additions and 68 deletions.

0 comments on commit bacec47

Please sign in to comment.