i18n: git-merge "You have not concluded your merge" messages
authorÆvar Arnfjörð Bjarmason <avarab@gmail.com>
Tue, 22 Feb 2011 23:42:01 +0000 (23:42 +0000)
committerJunio C Hamano <gitster@pobox.com>
Thu, 10 Mar 2011 07:52:55 +0000 (23:52 -0800)
commit2ce216e...da0ed3daf7dbcefe9758a5153c6f9d5a
tree95d0250...ce801e4b66c44bd7583f8c693114aa0acopy hash to clipboard (tree)
parent2ceb61e...a030eddd46cc62e4d9a0fbf2d16faad1copy hash to clipboard (diff)
t/t3030-merge-recursive.sh