aboutsummaryrefslogtreecommitdiff
path: root/git-mergetool--lib.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-11-17 09:28:23 -0800
committerJunio C Hamano <gitster@pobox.com>2014-11-17 09:28:23 -0800
commitea4f93eb99038329bbd692c5c8246e5ec8c11da9 (patch)
treeefd2bdc692671f29d702dc5f26a65c8e6c4ee4c6 /git-mergetool--lib.sh
parent49e0c5ad0ab95e450138105ff27688861a4a1557 (diff)
parentd544b2d495295142cb3418b13b5a106d415d2216 (diff)
downloadgit-ea4f93eb99038329bbd692c5c8246e5ec8c11da9.tar.gz
git-ea4f93eb99038329bbd692c5c8246e5ec8c11da9.tar.xz
Merge branch 'master' of git://github.com/git-l10n/git-po
* 'master' of git://github.com/git-l10n/git-po: l10n: de.po: translate 62 new messages l10n: de.po: Fixup one translation l10n: de.po: use imperative form for command options
Diffstat (limited to 'git-mergetool--lib.sh')
0 files changed, 0 insertions, 0 deletions