summaryrefslogtreecommitdiff
path: root/Documentation/git-mergetool.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-01-07 13:09:32 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-01-07 13:09:32 -0800
commit7938918e9ff4eb481c4bbe9132b26475da65069a (patch)
tree87393b4d01e796315fc8887f9a3469cdb5cce8ac /Documentation/git-mergetool.txt
parentMerge branch 'bb/update-unicode-table' (diff)
parentDocumentation/SubmittingPatches: unify whitespace/tabs for the DCO (diff)
downloadtgif-7938918e9ff4eb481c4bbe9132b26475da65069a.tar.xz
Merge branch 'sb/dco-indentation-fix'
* sb/dco-indentation-fix: Documentation/SubmittingPatches: unify whitespace/tabs for the DCO
Diffstat (limited to 'Documentation/git-mergetool.txt')
0 files changed, 0 insertions, 0 deletions