From: Marcin Zalewski <marcin.zalewski@gmail.com>
Date: Sun, 03 May 2009 18:47:38 GMT
Subject: Re: [PATCH] mergetool--lib: specialize diff options for emerge and ecmerge
Message-ID: <7c0fdf4f0905031147o47a7d2b1wbaa80df9058afeb6@mail.gmail.com>
In-Reply-To: <20090502194636.GA599@gmail.com>

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