From: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>
Date: Sat, 16 Jul 2011 02:19:27 GMT
Subject: Re: rerere affects handling of git-stash-pop merge conflicts
Message-ID: <alpine.DEB.2.00.1107152208530.12060@debian>
In-Reply-To: <4E1F22DF.7060209@cisco.com>

On Thu, 14 Jul 2011, Phil Hord wrote:

> Summary:
> After a 'git stash pop' with conflicts, 'git mergetool' fails to notice
> the conflicted files if 'rerere.enabled=true'.  git mergetool
> erroneously reports 'no files need merging'.

It seems to be because git-stash uses git merge-recursive directly
instead of calling git merge. I don't know why git merge-recursive is
used directly. It has been like that ever since git-stash was
introduced in f2c66ed (Add git-stash script, 2007-06-30).