i18n: merge-octopus: mark messages for translation
commit6a4eb91a73fa88bfbeb8d570895052b2b28693cf
authorVasco Almeida <vascomalmeida@sapo.pt>
Fri, 17 Jun 2016 20:20:56 +0000 (17 20:20 +0000)
committerJunio C Hamano <gitster@pobox.com>
Fri, 17 Jun 2016 22:45:48 +0000 (17 15:45 -0700)
treeac8120942d5273798dcbf7e612c91391231c52ef
parente8d7c3909d28ad6d01ae4d365ee332d724f423c0
i18n: merge-octopus: mark messages for translation

Mark messages in git-merge-octopus.sh for translation.

Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
git-merge-octopus.sh