On Mon, Nov 7, 2011 at 23:55, Jeff King <peff@xxxxxxxx> wrote: > In the general case, you can't represent all failed hunks with conflict > markers, can you? I'm thinking something where we couldn't find any > relevant context. You know the lines from the original patch from the > hunk header, so you can drop the failed content from the patch in the > right spot. But how do you know how big a conflict marker to make for > the "current" side? The same number of lines as were in the hunk? > I think you'd end up with confusing conflict markers. GNU patch can produce conflict markers with the --merge option. Bert > > -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