i18n: git-checkout: our/their version message
commit9f97ab08c236927cdaa5b47204f97588f006c61e
authorÆvar Arnfjörð Bjarmason <avarab@gmail.com>
Tue, 22 Feb 2011 23:41:40 +0000 (22 23:41 +0000)
committerJunio C Hamano <gitster@pobox.com>
Thu, 10 Mar 2011 07:52:53 +0000 (9 23:52 -0800)
tree0da664b80c069a8cbdb0c26a97f908725c43113c
parente8a8a4d76b1a609b343a174212655c5e07e00b50
i18n: git-checkout: our/their version message

Split up the "does not have our/their version" message to make it
easier to translate.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/checkout.c