]> git.ipfire.org Git - thirdparty/git.git/commit - t/t6423-merge-rename-directories.sh
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 48c9cb9) | patch
t6036, t6043: increase code coverage for file collision handling
authorElijah Newren <newren@gmail.com>
Thu, 8 Nov 2018 04:40:30 +0000 (20:40 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 8 Nov 2018 05:23:54 +0000 (14:23 +0900)
commitb8cd1bb71306e489d73e5cf4ef75a6cdb4c223b7
tree5e519913cb329c9bd48ab2f2687388c4da478468tree | snapshot
parent48c9cb9d6d058bcf18e931a1ed0d88792bb506c9commit | diff
t6036, t6043: increase code coverage for file collision handling

Stolee's coverage reports found a few code blocks for file collision
conflicts that had not previously been covered by testcases; add a few
more testcases to cover those too.

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/t6036-recursive-corner-cases.sh diff | blob | blame | history
t/t6043-merge-rename-directories.sh diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.