i18n: merge-file: mark parseopt strings for translation
authorNguyễn Thái Ngọc Duy <pclouds@gmail.com>
Mon, 20 Aug 2012 12:32:23 +0000 (19:32 +0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 20 Aug 2012 19:23:18 +0000 (12:23 -0700)
commitc7d93da38e0c4f6bee1e14c32827e33cdbfb4524
treef9a5e6bce5e3e9dad4e1e208d038f51c343a91fb
parentf037dbf49c6c8ef66d7efda30dde01e2cafb57ff
i18n: merge-file: 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-file.c