i18n: merge: mark parseopt strings for translation
commit962e629567464733dd43c60b6449a0ac26fc5c7a
authorNguyễn Thái Ngọc Duy <pclouds@gmail.com>
Mon, 20 Aug 2012 12:32:24 +0000 (20 19:32 +0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 20 Aug 2012 19:23:18 +0000 (20 12:23 -0700)
tree36fc64bd3102fabd0ae651d86e7704682dde50fc
parentc7d93da38e0c4f6bee1e14c32827e33cdbfb4524
i18n: merge: mark parseopt strings for translation

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/merge.c