Martin von Zweigbergk <martin.von.zweigbergk@xxxxxxxxx> writes: > 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). But "stash pop/apply" should never call "merge" directly, as it is not interested in creating (nor preparing to create, with "merge --no-commit") a new merge commit, nor doing the history level three-way merge. Calling merge-recursive backend is used as a way to run a three-way tree merge with explicitly specified three trees. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html