David, Thanks for your patches. > If an emacs user could comment on the emerge snippet > below (or perhaps suggest a better one ;)) then that > would make me happy. As is, I have tested the > emacs emerge snippet and it works, but I'm not > sure if that's enough to resolve the issue reported > by Marcin. Marcin? > > Here's the original thread: > http://article.gmane.org/gmane.comp.version-control.git/117930 As far as I am concerned, this patch works well. Without the third argument, ediff will not complain anymore that it is "too dangerous to merge versions of a file visited by another buffer," which was my original problem. -Marcin -- 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