aboutsummaryrefslogtreecommitdiff
path: root/git-merge-resolve.sh
diff options
context:
space:
mode:
authorJohannes Schindelin <johannes.schindelin@gmx.de>2016-10-21 14:26:32 +0200
committerJunio C Hamano <gitster@pobox.com>2016-10-21 09:32:35 -0700
commit791eb8708f7a98c9f3924b1810c20a9c7dd4c767 (patch)
tree2ab2f2a47cee03b53a94bf1b8c4a937424e7b49e /git-merge-resolve.sh
parent93b3df6f147fa2bf10116aaeb3597e0b6becaf35 (diff)
downloadgit-791eb8708f7a98c9f3924b1810c20a9c7dd4c767.tar.gz
git-791eb8708f7a98c9f3924b1810c20a9c7dd4c767.tar.xz
sequencer: mark all error messages for translation
There was actually only one error message that was not yet marked for translation. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions