Fixes: * test renamed and commit message rewritten, so that it mentions 3-parent merge rather than other uses * test: fix && chaining and do at new line * use postincrement in C code Max Kirillov (4): t4059: test 'diff --cc' with a change from only few parents combine-diff.c: refactor: extract insert_path() diff --cc: relax too strict paths picking t4059: rewrite to be adaptive to hunk filtering combine-diff.c | 95 +++++++++------ t/t4059-diff-cc-not-affected-by-path-filtering.sh | 142 ++++++++++++++++++++++ 2 files changed, 203 insertions(+), 34 deletions(-) create mode 100755 t/t4059-diff-cc-not-affected-by-path-filtering.sh -- 2.3.4.2801.g3d0809b -- 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
