On Tue, Jul 17, 2007 at 06:13:12PM +0100, Johannes Schindelin wrote: > When a merge has a d/f conflict on a path which was not touched > between the merge base(s) and the remote HEAD, and the index and > HEAD contain the same version for that path (even if empty), it > is not really a conflict. Hi, this patch solves the reported problem fine, and it didn't break anything for me yet. Can this still be considered for 1.5.3? Thanks, Gerrit. - 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
