Jeff King <p...@peff.net> writes: > then it will produce the output that Uwe expects. While it can be > misleading,...
Misleading is one thing but in this case isn't it outright wrong? If you remove <<< ours ||| portion from the combined diff output, I would expect that the hunk will apply to the base, but that is no longer true, no? -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
