diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2009-12-03 13:54:25 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-12-03 13:54:25 -0800 |
| commit | c8b1d761f61c4be0b036620ba418ff0e97979fde (patch) | |
| tree | 45bb20243c75d8fbc3a39c3bf401f9e6f53ec0b3 /builtin-merge-file.c | |
| parent | Merge branch 'ap/maint-merge-strategy-list-fix' into maint (diff) | |
| parent | format-patch: add test for parsing of "--" (diff) | |
| download | tgif-c8b1d761f61c4be0b036620ba418ff0e97979fde.tar.xz | |
Merge branch 'fc/maint-format-patch-pathspec-dashes' into maint
* fc/maint-format-patch-pathspec-dashes:
format-patch: add test for parsing of "--"
format-patch: fix parsing of "--" on the command line
Diffstat (limited to 'builtin-merge-file.c')
0 files changed, 0 insertions, 0 deletions