Add a test for read-tree -u --reset with a D/F conflict