Merge branch 'jc/maint-diffstat-numstat-context' into maint

diff --git a/unpack-trees.c b/unpack-trees.c
index 670b46473883505c39c5353c65e0eeb93aec21c3..237aed8c766638c55d8d6b870c86ef2ad13a74d3 100644 (file)
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@ -159,7 +159,7 @@ static void display_error_msgs(struct unpack_trees_options *o)
                string_list_clear(rejects, 0);
        }
        if (something_displayed)
-               printf("Aborting\n");
+               fprintf(stderr, "Aborting\n");
 }
 
 /*