diff options
| author |  Elijah Newren <newren@gmail.com> | 2018-06-30 21:11:22 -0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-07-11 08:40:29 -0700 |
| commit | 5d1daf30cce5744b219002e0a6da015a13216cd1 (patch) | |
| tree | 941fd62b23af3f02871c20b38b276b60b223a2e3 /sequencer.c | |
| parent | t6036: add a failed conflict detection case with conflicting types (diff) | |
| download | tgif-5d1daf30cce5744b219002e0a6da015a13216cd1.tar.xz | |
t6036: add a failed conflict detection case: regular files, different modes
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'sequencer.c')
0 files changed, 0 insertions, 0 deletions