I hope it's not bad style to take someone else's testcase from the mailing
list and submit it on their behalf as a testsuite addition (nor do I know
what to do about the signed-off-by line in this case). This is simply the
testcase Alexander Gladysh posted to the list on March 8. I really like
his example due to how it serves as a simple case where there are two D/F
conflicts with a rename across paths involved in both of those D/F
conflicts.
I have no problem if you use my test case for the Git testsuite. The
more tests — the merrier. :-)
Consider this testcase as signed-off by me.
If you feel that you need to mention my name somewhere and proper Git
headers are a problem — commit comments would do.
If, to honor all formalities, you would need my actual commit — please
tell me, I'll try to submit it.
Alexander.