fredag 23 januari 2009 08:18:15 skrev Jay Soffian: > On Thu, Jan 22, 2009 at 3:13 PM, Robin Rosenberg > <robin.rosenberg.lists@xxxxxxxxxx> wrote: [...] > > 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. Where's the ancestor? I'm used to having four panes for doing three-way merges, but your screenshot showed only three. > > Shrug. You have the option to ignore me.... -- robin -- 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
