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). -- 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