summaryrefslogtreecommitdiff
path: root/Documentation/git-mergetool.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-10-05 12:45:30 -0700
committerJunio C Hamano <gitster@pobox.com>2012-10-05 12:45:30 -0700
commit68bdfd7cdc634693320486c06400b60abe92302b (patch)
tree2c30985fd5933b97dfc4d1109956c72ec772be73 /Documentation/git-mergetool.txt
parent4742d136e2c8423ce17ccd0ccf161d9f20d49847 (diff)
parentf9f6e2ce26e25661245a6faaf0b254524c1bfbd4 (diff)
downloadgit-68bdfd7cdc634693320486c06400b60abe92302b.tar.gz
Merge commit 'f9f6e2c' into nd/attr-match-optim-more
* commit 'f9f6e2c': exclude: do strcmp as much as possible before fnmatch dir.c: get rid of the wildcard symbol set in no_wildcard() Unindent excluded_from_list()
Diffstat (limited to 'Documentation/git-mergetool.txt')
0 files changed, 0 insertions, 0 deletions