On Thu, Aug 14, 2008 at 10:21:59PM +0200, Stephan Beyer wrote: > Instead of generating reject files it puts conflict markers into the file. > (If no context matches at all, then perhaps just insert them at the lines > that the hunk header says.) > And then declaring the files as "unmerged", so that you can see it in > git status. I use "git am -3" for that. Then you get conflict markers, or you can use git-mergetool. -Peff -- 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
