summaryrefslogtreecommitdiff
path: root/builtin/merge-tree.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-08-29 17:18:22 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-08-29 17:18:22 (GMT)
commit96db324a73fdada6fbe7b63221986f8f18cc63b0 (patch)
tree69a02a3eb6190bd30c962bb4b30e8734463dfe93 /builtin/merge-tree.c
parent4109c28e055dba27d73cefb956bea5e611f66ec0 (diff)
parent782ac539ea6fd069ede52917f047ffa9a81947e5 (diff)
downloadgit-96db324a73fdada6fbe7b63221986f8f18cc63b0.zip
git-96db324a73fdada6fbe7b63221986f8f18cc63b0.tar.gz
git-96db324a73fdada6fbe7b63221986f8f18cc63b0.tar.bz2
Merge git://github.com/git-l10n/git-po
* git://github.com/git-l10n/git-po: po/TEAMS: add new members to German translation team l10n: de.po: translate 38 new messages
Diffstat (limited to 'builtin/merge-tree.c')
0 files changed, 0 insertions, 0 deletions