summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-09-11 11:10:23 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-09-11 11:10:23 -0700
commit23242a6f9e838013fbfddd4e8eb023d8c9328d37 (patch)
tree2185ffc6becaf4da9a6fefe10db1f61979872f33 /Documentation
parentMerge branch 'sz/submodule-force-update' into maint-1.7.11 (diff)
parentmergetool: style fixes (diff)
downloadtgif-23242a6f9e838013fbfddd4e8eb023d8c9328d37.tar.xz
Merge branch 'jc/maint-mergetool-style-fix' into maint-1.7.11
* jc/maint-mergetool-style-fix: mergetool: style fixes
Diffstat (limited to 'Documentation')
0 files changed, 0 insertions, 0 deletions