summaryrefslogtreecommitdiff
path: root/Documentation/git-mergetool.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2009-01-25 17:13:11 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-01-25 17:13:11 -0800
commitd64d4835b83669d5c9c8ce1989859efa803874db (patch)
tree6748e48171e74bb97dc56efa9e7d133a7674e1a2 /Documentation/git-mergetool.txt
parentMerge branch 'js/maint-all-implies-HEAD' (diff)
parentremove pathspec_match, use match_pathspec instead (diff)
downloadtgif-d64d4835b83669d5c9c8ce1989859efa803874db.tar.xz
Merge branch 'cb/add-pathspec'
* cb/add-pathspec: remove pathspec_match, use match_pathspec instead clean up pathspec matching
Diffstat (limited to 'Documentation/git-mergetool.txt')
0 files changed, 0 insertions, 0 deletions