Quoting Thomas Rast <trast@xxxxxxxxxxxxxxx> > It is *not* > the often requested (but ill-defined and hence never implemented) > "resolve all conflict hunks in favour of ours" strategy. This was implemented and posted here quite some time ago. http://thread.gmane.org/gmane.comp.version-control.git/85163/focus=85602 -- Nanako Shiraishi http://ivory.ap.teacup.com/nanako3/ -- 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