Junio C Hamano schrieb: > Textual diff output for unmerged paths was too eager to give condensed > combined diff. This has two problems: > > (1) "diff --base/--ours/--theirs" (and "diff-files -p" with the same) is > a request to compare with the named stage. We showed "-c -p" output > instead; I cannot reproduce what you describe here. "diff --base/--ours/--theirs" works as expected with and without this patch. > (2) "diff -c" (and "diff-files -c -p") is a request to view combined diff > without condensing (otherwise the user would have explicitly asked > for --cc, not -c). We showed "--cc" output anyway. The patch fixes this: Tested-by: Johannes Sixt <johannes.sixt@xxxxxxxxxx> -- Hannes -- 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
