On Thu, Jan 22, 2009 at 3:13 PM, Robin Rosenberg <robin.rosenberg.lists@xxxxxxxxxx> wrote: > torsdag 22 januari 2009 11:57:41 skrev Jonathan del Strother: >> Mmm. I use opendiff, which is generally ok, but in this case produced >> a merge looking like this : >> >> http://pastie.org/paste/asset/367587/Picture_6.png >> >> Which, in my mind, isn't any clearer about the fact that both lines >> ought to be deleted than the text conflict markers are. Do any of the >> other graphical tools present conflicts like that differently? > > Try a three-way merge tool instead like, e.g. xxdiff. opendiff (aka FileMerge) *is* a three-way merge tool. If the screenshot above is not clear, I'm not sure what would be. The left pane shows your copy of the file with only line1, line3, and line4. The right pane shows the other copy, with only line1, line2, and line4. The lower pane shows the merge resolution, which currently has the single conflict highlighted, and is being resolved toward the right. You can use the Action drop down menu to resolve the conflict one of five ways: left, right, both (left first), both (right first), neither. You've currently got "right" selected. The appropriate resolution is "neither", which keeps neither line3 from the left, nor line2 from the right. Shrug. j. -- 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
