Merge branch 'rr/test-use-shell-path-not-shell' into maint

[~andy/git] / ll-merge.c

diff --git a/ll-merge.c b/ll-merge.c
index 307315b7883db7dbaa8835e1cda72cdd7bdaae93..acea33bf1babfe541c319081f14625ac779bb582 100644 (file)
--- a/ll-merge.c
+++ b/ll-merge.c
@@ -53,7 +53,7 @@ static int ll_binary_merge(const struct ll_merge_driver *drv_unused,
        } else {
                switch (opts->variant) {
                default:
-                       warning("Cannot merge binary files: %s (%s vs. %s)\n",
+                       warning("Cannot merge binary files: %s (%s vs. %s)",
                                path, name1, name2);
                        /* fallthru */
                case XDL_MERGE_FAVOR_OURS: