On 2009-04-28 16:09:40 +0100, Catalin Marinas wrote:
> My main reason is for the automatic invocation of the interactive
> merge when I don't know what patch I have to deal with. The other
> reasons is for people working over slow filesystems (NFS) where a
> three-way merging may take a significant amount of time.
I don't see any problems with this.
--
Karl Hasselström, kha@xxxxxxxxxxx
www.treskal.com/kalle
--
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