| commit | 5d1daf30cce5744b219002e0a6da015a13216cd1 | |
| author | Elijah Newren <newren@gmail.com> | |
| Sun, 1 Jul 2018 04:11:22 +0000 (30 21:11 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 11 Jul 2018 15:40:29 +0000 (11 08:40 -0700) | ||
| tree | 941fd62b23af3f02871c20b38b276b60b223a2e3 | treesnapshot (tar.gz zip) |
| parent | 451a3abc262575e5ed325b71547d345c55cc7d1d | commitdiff |
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>
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| t/t6036-recursive-corner-cases.sh | diffblobblamehistory |