issue, presumably git 2.34 new merge strategy to blame
authorjkniiv <jkniiv@web>
Sun, 21 Nov 2021 18:49:02 +0000 (18:49 +0000)
committeradmin <admin@branchable.com>
Sun, 21 Nov 2021 18:49:02 +0000 (18:49 +0000)
commita0e9a059ab75acfeed5524fe410cee4414807ced
treead84244ab4381c9b83e0940080684668cab491e3
parent0f9e5ada82a7ba5a3267c67c2b89d8714abfc3c5
issue, presumably git 2.34 new merge strategy to blame
doc/bugs/git_2.34__58___some_conflict_resolution_unit_tests_fail.mdwn [new file with mode: 0644]