On Fri, Feb 6, 2009 at 2:32 PM, Jonathan del Strother <jon.delStrother@xxxxxxxxxxxxx> 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? -- 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
