Jakub Narebski <jnareb@xxxxxxxxx> wrote: > 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)? Yes. :-) Right now I think the user could just "plug in" their own "merge" program earlier in PATH than the real one. :-) It would be nice to get the speed of being able to just run the xdiff code and the Git apply code directly on the file blobs in memory, without forking, but I think pluggable file content merging programs is a very good idea, for lots of different reasons. -- Shawn. - 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