Re: [PATCH 6/8 v2] sh-tools: add a run_merge_tool function

From: David Aguilar <davvid@gmail.com>
Date: Apr 2, 2009, 05:33 UTC
Message-ID: <20090402053345.GA4185@gmail.com>
In-Reply-To: <885649360903311115o6131988emdcba6ef215ec0ab0@mail.gmail.com>

On  0, James Pickens <jepicken@gmail.com> wrote:

Show 13 quoted lines

> On Mon, Mar 30, 2009 at 1:11 AM, David Aguilar <davvid@gmail.com> wrote:
> > This function launches merge tools and will be used to refactor
> > git-(diff|merge)tool.
> 
> Thanks for writing difftool; I find it quite useful.  I tried it with
> tkdiff, and noticed that it shows the 'merge preview' window even though it
> isn't doing a merge.  If a user with unstaged changes were to carelessly
> click the 'save and exit' button, his changes could be lost.  So I think
> it's a good idea to stop the merge preview window from showing up under
> difftool.  To do that I think you just have to remove the '-o "$MERGED"'
> option to tkdiff.
> 
> James

Hi James

I included your suggestion in my latest patch series. Once things settle down with the current series I'll add diffuse to {diff,merge}tool and friends.

So, yup, this shouldn't be an issue in future versions of difftool.

Thanks

-- 
	David