diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-10-28 09:01:12 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-10-28 09:01:12 -0700 |
| commit | 68eb7b1b5222d5c9db2a9d5047bffe3fb65280f8 (patch) | |
| tree | 88ac15180b8aaf573f860a1734d27d6a6c24dee1 /builtin/merge-recursive.c | |
| parent | Merge branch 'rs/c-auto-resets-attributes' into maint (diff) | |
| parent | configure.ac: improve description of NO_REGEX test (diff) | |
| download | tgif-68eb7b1b5222d5c9db2a9d5047bffe3fb65280f8.tar.xz | |
Merge branch 'js/regexec-buf' into maint
A follow-up to an already graduated topic.
* js/regexec-buf:
configure.ac: improve description of NO_REGEX test
Diffstat (limited to 'builtin/merge-recursive.c')
0 files changed, 0 insertions, 0 deletions