This patch serie aims at grouping porcerlain merge and checkout errors messages by type if possible, listing all the file concerned by the error type. It also adds porcelain messages for checkout. It was first introduced in the thread: http://mid.gmane.org/7v63277f92.fsf@xxxxxxxxxxxxxxxxxxxxxxxx Diane Gasselin (5): merge-recursive: update merge porcelain messages for checkout unpack_trees: group errors by type unpack_trees_options: update porcelain messages tests: update porcelain expected message t7609: test merge and checkout error messages builtin/checkout.c | 4 +- builtin/merge.c | 3 +- merge-recursive.c | 48 ++++++++++------ merge-recursive.h | 6 +- t/t3030-merge-recursive.sh | 2 +- t/t3400-rebase.sh | 2 +- t/t7609-merge-co-error-msgs.sh | 125 ++++++++++++++++++++++++++++++++++++++++ tree-walk.c | 11 +++- unpack-trees.c | 119 +++++++++++++++++++++++++++++++++++--- unpack-trees.h | 31 ++++++++++- 10 files changed, 316 insertions(+), 35 deletions(-) create mode 100755 t/t7609-merge-co-error-msgs.sh -- 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