summaryrefslogtreecommitdiff
path: root/Documentation/git-mergetool.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2019-01-14 15:29:29 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-01-14 15:29:29 -0800
commit68f1c0d102f4422c4fa59f597335ddef7602d27e (patch)
treedb0971a1a2c512fb61da62fc0d5da12a1f4097d2 /Documentation/git-mergetool.txt
parentMerge branch 'nd/checkout-noisy' (diff)
parentt0061: do not fail test if '.' is part of $PATH (diff)
downloadtgif-68f1c0d102f4422c4fa59f597335ddef7602d27e.tar.xz
Merge branch 'hb/t0061-dot-in-path-fix'
Test update. * hb/t0061-dot-in-path-fix: t0061: do not fail test if '.' is part of $PATH
Diffstat (limited to 'Documentation/git-mergetool.txt')
0 files changed, 0 insertions, 0 deletions