Re: [PATCH v2 4/6] add --simplify-combined-diff option

2014-07-29 Thread Junio C Hamano
Jeff King writes: > When showing a combined diff, we are comparing two (or more) > parents to a final state, and some of these states may be > the same. Here's a table of the possible contents for a > given path (for two parents, but we will generalize to more > in a moment; we also omit isomorp

[PATCH v2 4/6] add --simplify-combined-diff option

2014-07-29 Thread Jeff King
When showing a combined diff, we are comparing two (or more) parents to a final state, and some of these states may be the same. Here's a table of the possible contents for a given path (for two parents, but we will generalize to more in a moment; we also omit isomorphic cases where the parents ar