summaryrefslogtreecommitdiff
path: root/mergetools/defaults
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-06-17 14:05:53 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-06-17 14:05:53 -0700
commita890c998de36b8460267b42779bbe34bad9c36d7 (patch)
tree87c4c01586ad76145f6afcf3fb837e1952fba236 /mergetools/defaults
parentMerge git://github.com/git-l10n/git-po (diff)
parentGit 1.7.10.5 (diff)
downloadtgif-a890c998de36b8460267b42779bbe34bad9c36d7.tar.xz
Sync with 1.7.10.5
Diffstat (limited to 'mergetools/defaults')
0 files changed, 0 insertions, 0 deletions