aboutsummaryrefslogtreecommitdiff
path: root/git-gui/lib
diff options
context:
space:
mode:
authorMichael J Gruber <git@drmicha.warpmail.net>2015-05-19 10:51:34 +0200
committerRalf Thielow <ralf.thielow@gmail.com>2015-06-12 20:40:04 +0200
commita9845c5f504498644abcb5f6fd6adc2ffd076f2b (patch)
tree4e462015fd9e005cb5e1abe1a0e56d46bb26544e /git-gui/lib
parent47a1657ab902a4cd98f34d01277246c533216beb (diff)
downloadgit-a9845c5f504498644abcb5f6fd6adc2ffd076f2b.tar.gz
git-a9845c5f504498644abcb5f6fd6adc2ffd076f2b.tar.xz
l10n: de.po: translation fix for fall-back to 3way merge
The English version is correct, but misleading: It is not the 3way merge that is being patched also, but that is being fallen back to also. The German version translates the former meaning. Make it translate the latter. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
Diffstat (limited to 'git-gui/lib')
0 files changed, 0 insertions, 0 deletions