summaryrefslogtreecommitdiff
path: root/Documentation/git-mergetool.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-10-17 10:37:32 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-10-17 10:37:32 -0700
commitd2bfef22e42bed1f5092655b1b3c8c309179b914 (patch)
treedd8545b2c63cb86a1f5f37b146114da60d61d404 /Documentation/git-mergetool.txt
parentDocumentation/RelNotes: remove "updated up to this revision" markers (diff)
parentGit 1.7.12.4 (diff)
downloadtgif-d2bfef22e42bed1f5092655b1b3c8c309179b914.tar.xz
Sync with 1.7.12.4
Diffstat (limited to 'Documentation/git-mergetool.txt')
0 files changed, 0 insertions, 0 deletions