summaryrefslogtreecommitdiff
path: root/Documentation/git-mergetool.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-02-25 15:40:21 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-02-25 15:40:22 -0800
commit767f000b4d9d3c602ac02eb1d671958cd614bf49 (patch)
tree1aa7ae71197517091b33b8fe7981b1e7b7c9150e /Documentation/git-mergetool.txt
parentMerge branch 'sb/plug-leak-in-make-cache-entry' (diff)
parentGit.pm: two minor typo fixes (diff)
downloadtgif-767f000b4d9d3c602ac02eb1d671958cd614bf49.tar.xz
Merge branch 'ak/git-pm-typofix'
Typofix in comments. * ak/git-pm-typofix: Git.pm: two minor typo fixes
Diffstat (limited to 'Documentation/git-mergetool.txt')
0 files changed, 0 insertions, 0 deletions