diff options
| author |  Elijah Newren <newren@gmail.com> | 2011-08-11 23:19:43 -0600 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2011-08-14 14:19:32 -0700 |
| commit | 827f2b7d297dfbe20809c0be600827834c2c3992 (patch) | |
| tree | 11eb399e0f71ff8e416ac87d764ed3de6c77def3 /parse-options.c | |
| parent | t6036: criss-cross with weird content can fool git into clean merge (diff) | |
| download | tgif-827f2b7d297dfbe20809c0be600827834c2c3992.tar.xz | |
t6036: tests for criss-cross merges with various directory/file conflicts
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'parse-options.c')
0 files changed, 0 insertions, 0 deletions