]> git.ipfire.org Git - thirdparty/git.git/commit - notes-merge.c
i18n: notes-merge: mark die messages for translation
authorVasco Almeida <vascomalmeida@sapo.pt>
Mon, 19 Sep 2016 13:08:20 +0000 (13:08 +0000)
committerJunio C Hamano <gitster@pobox.com>
Wed, 21 Sep 2016 17:20:43 +0000 (10:20 -0700)
commitc041c6d06a7fce3aa563d7b0c4a47feccc541400
tree8050a5106689367cedd8d2e08d45378de96c3962
parent166e55e328a5b303031140f758a0463df331777a
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>
notes-merge.c
t/t3310-notes-merge-manual-resolve.sh