Shawn Pearce wrote: > But I don't really want this as a merge strategy in its own right. > I want it as part of merge-recur (...) Wouldn't it be better to have pluggable way to deal with conflicts, be it diff3/merge with conflict markers, .rej files, or invoking graphical merge tool (vimdiff, Emacs Emerge, xxdiff, Meld, KDiff3)? -- Jakub Narebski Warsaw, Poland ShadeHawk on #git - 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