"Anders Melchiorsen" <mail@xxxxxxxxxxxxxxxx> writes: > Your patch got rid of the errors and it commits the merged tree. But the > working tree is not updated correctly, so the moved file disappears. Isn't this a long known breakage of D/F conflict check logic in merge-recursive backend? -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
