summaryrefslogtreecommitdiff
path: root/mergetools/defaults
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-08-19 17:02:11 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-08-19 17:02:11 -0700
commit889d35899ba64640e47798681ecb34a4be043bad (patch)
treec2344a25e9848b35f22f05c568719a2b2011246b /mergetools/defaults
parentMerge branch 'jc/doc-git-updates' (early part) (diff)
downloadtgif-889d35899ba64640e47798681ecb34a4be043bad.tar.xz
Git 1.7.12
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'mergetools/defaults')
0 files changed, 0 insertions, 0 deletions