Dan Zwell <dzwell@xxxxxxxxx> writes: > My impression is that diff --cc is called any time > that HEAD has two parents. Is this correct? You get combined output when your index is unmerged. Showing combined output to the user to examine may make sense, but I think you would want to have the user pick from diff between stage#2 and the work tree for an unmerged entry, if you allow to pick hunks during a conflicted merge. - 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
