diff options
| author |  Elijah Newren <newren@gmail.com> | 2018-06-30 21:11:21 -0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-07-03 14:43:43 -0700 |
| commit | 451a3abc262575e5ed325b71547d345c55cc7d1d (patch) | |
| tree | 930af29bfdb41efe1fc1a0bf32f92ea23cb5c98d /merge-blobs.c | |
| parent | t6036: add a failed conflict detection case with submodule add/add (diff) | |
| download | tgif-451a3abc262575e5ed325b71547d345c55cc7d1d.tar.xz | |
t6036: add a failed conflict detection case with conflicting types
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-blobs.c')
0 files changed, 0 insertions, 0 deletions