This is cleaned-up series of my previous attempts that were queued in 'pu' late in the pre-1.7.5 cycle. Junio C Hamano (4): test: use $_z40 from test-lib diff.c: return filepair from diff_unmerge() diff: remove often unused parameters from diff_unmerge() diff-files: show unmerged entries correctly diff-lib.c | 15 +++++-- diff.c | 12 +++--- diff.h | 5 +-- t/t1400-update-ref.sh | 2 +- t/t1501-worktree.sh | 7 +-- t/t2011-checkout-invalid-head.sh | 2 +- t/t2201-add-update-typechange.sh | 2 - t/t3200-branch.sh | 4 +- t/t3600-rm.sh | 3 +- t/t4002-diff-basic.sh | 5 +-- t/t4020-diff-external.sh | 2 - t/t4027-diff-submodule.sh | 1 - t/t4046-diff-unmerged.sh | 87 ++++++++++++++++++++++++++++++++++++++ t/t7011-skip-worktree-reading.sh | 4 +- t/t7012-skip-worktree-writing.sh | 2 +- t/test-lib.sh | 3 + 16 files changed, 120 insertions(+), 36 deletions(-) create mode 100755 t/t4046-diff-unmerged.sh -- 1.7.5 -- 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