summaryrefslogtreecommitdiff
path: root/Documentation/merge-options.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-11-27 13:29:00 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-11-27 13:29:00 -0800
commit86ef7b37f921dccff6d940fb17005e0906a2bf3e (patch)
treea4f93ae59209a5e9fd12a583617ab453a67f6c8e /Documentation/merge-options.txt
parentMerge branch 'jh/update-ref-d-through-symref' into maint (diff)
parentcompat/fnmatch: fix off-by-one character class's length check (diff)
downloadtgif-86ef7b37f921dccff6d940fb17005e0906a2bf3e.tar.xz
Merge branch 'nd/maint-compat-fnmatch-fix' into maint
* nd/maint-compat-fnmatch-fix: compat/fnmatch: fix off-by-one character class's length check
Diffstat (limited to 'Documentation/merge-options.txt')
0 files changed, 0 insertions, 0 deletions