Elijah Newren <newren@xxxxxxxxx> writes: > Whenever there are merge conflicts in file contents, we would mark the > different sides of the conflict with the two branches being merged. > However, when there is a rename involved as well, the branchname is not > sufficient to specify where the conflicting content came from. In such > cases, mark the two sides of the conflict with branchname:filename rather > than just branchname. > > Signed-off-by: Elijah Newren <newren@xxxxxxxxx> Nice. -- 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