From: James Pickens <jepicken@gmail.com>
Date: Tue, 31 Mar 2009 18:15:52 GMT
Subject: Re: [PATCH 6/8 v2] sh-tools: add a run_merge_tool function
Message-ID: <885649360903311115o6131988emdcba6ef215ec0ab0@mail.gmail.com>
In-Reply-To: <1238400684-14881-1-git-send-email-davvid@gmail.com>

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