[PATCH 3/4] diff --cc: relax too strict paths picking

For diff --cc, paths fitering used to select only paths which have changed in all parents, while diffing itself output hunks which are changed in as few as 2 parents. Fix intersect_paths() to add paths which have at least 2 changed parents. In this new functionality does not require special

Re: [PATCH 3/4] diff --cc: relax too strict paths picking

Max Kirillov m...@max630.net writes: Again, just surface nitpicks. [side: Kirill Smelkov k...@mns.spb.ru removed from CC, as the ddress just bounced for me] +static int changed_parents(struct combine_diff_path *p, int n) +{ + int parent_idx; + int result = 0; + + for