summaryrefslogtreecommitdiff
path: root/merge-recursive.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-10-17 13:25:21 -0700
committerJunio C Hamano <gitster@pobox.com>2016-10-17 13:25:21 -0700
commit9424bf27079a1262e42a2330283f7ab6c805267a (patch)
tree61486b7b2c8d1e4ebd55418e5375b45e32e136f2 /merge-recursive.c
parentf7300cbfdde611d4bf2b7185e9d00624526953ef (diff)
parent842a516cb02a53cf0291ff67ed6f8517966345c0 (diff)
downloadgit-9424bf27079a1262e42a2330283f7ab6c805267a.tar.gz
Merge branch 'js/regexec-buf'
* js/regexec-buf: configure.ac: improve description of NO_REGEX test
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions