summaryrefslogtreecommitdiff
path: root/merge.c
diff options
context:
space:
mode:
authorLibravatar Vasco Almeida <vascomalmeida@sapo.pt>2016-09-15 14:59:02 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-09-15 13:17:32 -0700
commit765773c8397800218e7389fd3e9431cfbfdb6ad1 (patch)
treefe3d26ff90a95eb927d514acb56b31c43370eb65 /merge.c
parenti18n: merge-recursive: mark error messages for translation (diff)
downloadtgif-765773c8397800218e7389fd3e9431cfbfdb6ad1.tar.xz
i18n: merge-recursive: mark verbose message for translation
Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge.c')
0 files changed, 0 insertions, 0 deletions