diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-09-02 10:00:38 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-09-02 10:00:38 -0700 |
| commit | 8a8895baaf9d200c907555fd30b0b6190b708a5a (patch) | |
| tree | 9ca717cf5314effc5dc09528bd4ff9c1c0bfe3bf /builtin/merge-file.c | |
| parent | Merge branch 'en/merge-recursive-2' (diff) | |
| parent | obstack: Fix portability issues (diff) | |
| download | tgif-8a8895baaf9d200c907555fd30b0b6190b708a5a.tar.xz | |
Merge branch 'fk/use-kwset-pickaxe-grep-f'
* fk/use-kwset-pickaxe-grep-f:
obstack: Fix portability issues
Use kwset in grep
Use kwset in pickaxe
Adapt the kwset code to Git
Add string search routines from GNU grep
Add obstack.[ch] from EGLIBC 2.10
Diffstat (limited to 'builtin/merge-file.c')
0 files changed, 0 insertions, 0 deletions