i18n: merge: mark messages for translation
commitbef4830e88008adf488d190c742e243cacc46e16
authorVasco Almeida <vascomalmeida@sapo.pt>
Fri, 17 Jun 2016 20:21:17 +0000 (17 20:21 +0000)
committerJunio C Hamano <gitster@pobox.com>
Fri, 17 Jun 2016 22:46:10 +0000 (17 15:46 -0700)
treec8fb6e320ac7ca1304027a605b30a43a0e0ea58e
parentb34c77e33e64844b00ed2836301032a031581d73
i18n: merge: mark messages for translation

Mark messages shown to the user for translation.

Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/merge.c