2008/7/2 Karl Hasselström <kha@xxxxxxxxxxx>: > The advantage is that patch application will resolve some file content > conflicts for us, so that we'll fall back to merge-recursive less > often. This is a significant speedup, especially since merge-recursive > needs to touch the worktree, which means we have to check out the > index first. Thanks. -- Catalin -- 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
