diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-03-14 00:16:26 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-03-14 00:16:26 -0700 |
| commit | 1b56bc9a1545902db64b8bdce48a499900acfe0b (patch) | |
| tree | 271f9169c23a82aace4fb0e812abedfdcdac9ba6 /builtin-merge-recursive.c | |
| parent | 381b851c9b010147bb1fa83a013b7c8f60419026 (diff) | |
| parent | 18d077c1bf576d51e2ad09e41b22042b8cb5c9f4 (diff) | |
| download | git-1b56bc9a1545902db64b8bdce48a499900acfe0b.tar.gz | |
Merge branch 'ph/maint-quiltimport' into maint
* ph/maint-quiltimport:
quiltimport: fix misquoting of parsed -p<num> parameter
git-quiltimport: better parser to grok "enhanced" series files.
Diffstat (limited to 'builtin-merge-recursive.c')
0 files changed, 0 insertions, 0 deletions