From: Jonathan del Strother <maillist@steelskies.com>
Date: Fri, 06 Feb 2009 14:41:45 GMT
Subject: Re: [PATCH] Offer to print changes while running git-mergetool
Message-ID: <57518fd10902060641pa789ffbjceccbf013864e0a5@mail.gmail.com>
In-Reply-To: <1233930745-77930-1-git-send-email-jon.delStrother@bestbefore.tv>

On Fri, Feb 6, 2009 at 2:32 PM, Jonathan del Strother
<jon.delStrother@bestbefore.tv> wrote:
> Add a "Show changes" option to each prompt in mergetool. This prints the conflicted changes on the current file, using 'git log -p --merge <file>'

Just discovered that this doesn't work so well when resolving merges
resulting from "git stash apply" - it produces "fatal: --merge without
MERGE_HEAD".  Should git-stash be setting MERGE_HEAD in this case, or
should I be using something other than 'git log --merge' to cover
these sorts of cases?