| commit | 451a3abc262575e5ed325b71547d345c55cc7d1d | |
| author | Elijah Newren <newren@gmail.com> | |
| Sun, 1 Jul 2018 04:11:21 +0000 (30 21:11 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 3 Jul 2018 21:43:43 +0000 (3 14:43 -0700) | ||
| tree | 930af29bfdb41efe1fc1a0bf32f92ea23cb5c98d | treesnapshot (tar.gz zip) |
| parent | a79968bed184029139ddcd0a4e8171a2c84852ee | commitdiff |
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>
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| t/t6036-recursive-corner-cases.sh | diffblobblamehistory |