summaryrefslogtreecommitdiff
path: root/builtin/merge-tree.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-09-12 14:53:47 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-09-12 14:53:47 -0700
commitb3e7d24ca19d841eb2c5c7fce7919ebb5d370a6f (patch)
treed4fff254364b3017f6eac0df860597bb3f04a97f /builtin/merge-tree.c
parentUpdate draft release notes to 1.8.5 for the third batch of topics (diff)
parentMerge branch 'maint' of git://github.com/git-l10n/git-po into maint (diff)
downloadtgif-b3e7d24ca19d841eb2c5c7fce7919ebb5d370a6f.tar.xz
Sync with maint for l10n updates
* maint: l10n: de.po: use "das Tag" instead of "der Tag"
Diffstat (limited to 'builtin/merge-tree.c')
0 files changed, 0 insertions, 0 deletions