summaryrefslogtreecommitdiff
path: root/git-merge-resolve.sh
diff options
context:
space:
mode:
authorLibravatar Vasco Almeida <vascomalmeida@sapo.pt>2016-09-19 13:08:20 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-09-21 10:20:43 -0700
commitc041c6d06a7fce3aa563d7b0c4a47feccc541400 (patch)
tree8050a5106689367cedd8d2e08d45378de96c3962 /git-merge-resolve.sh
parenti18n: ident: mark hint for translation (diff)
downloadtgif-c041c6d06a7fce3aa563d7b0c4a47feccc541400.tar.xz
i18n: notes-merge: mark die messages for translation
Update test to reflect changes. Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions