diff options
| author | Elijah Newren <newren@gmail.com> | 2018-06-30 21:11:20 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-07-03 14:43:43 -0700 |
| commit | a79968bed184029139ddcd0a4e8171a2c84852ee (patch) | |
| tree | 428c0bbde1116a1c7bfcb5816121a7ce783fc861 /commit.c | |
| parent | t6036: add a failed conflict detection case with submodule modify/modify (diff) | |
| download | git-a79968bed184029139ddcd0a4e8171a2c84852ee.tar.gz git-a79968bed184029139ddcd0a4e8171a2c84852ee.zip | |
t6036: add a failed conflict detection case with submodule add/add
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'commit.c')
0 files changed, 0 insertions, 0 deletions