diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-03-28 21:05:57 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-03-28 21:05:57 (GMT) |
| commit | ff8b7e63dede832e8a02ce632fc70dcb59bf2681 (patch) | |
| tree | 6deff66999eaa59bd884cd18c2509481db2e36d1 /builtin/merge.c | |
| parent | e0ef7fe78c46e6919d249b9547948a3bb7321dea (diff) | |
| parent | 2225e1ea20481a7c0da526891470abf9ece623e7 (diff) | |
| download | git-ff8b7e63dede832e8a02ce632fc70dcb59bf2681.zip git-ff8b7e63dede832e8a02ce632fc70dcb59bf2681.tar.gz git-ff8b7e63dede832e8a02ce632fc70dcb59bf2681.tar.bz2 | |
Merge branch 'bw/grep-recurse-submodules'
Build fix for NO_PTHREADS build.
* bw/grep-recurse-submodules:
grep: fix builds with with no thread support
grep: set default output method
Diffstat (limited to 'builtin/merge.c')
0 files changed, 0 insertions, 0 deletions