Make sure we error out if we can't remove a file on automatic merges.

diff --git a/git-external-diff-script b/git-external-diff-script
index 0d34b670bcfc516d352f3bff72bf798ac9832f99..137280ac724ac95fc9784e092868fafcf6c35e8d 100644 (file)
--- a/git-external-diff-script
+++ b/git-external-diff-script
@@ -59,7 +59,7 @@ then
     echo "new mode $mode2"
     if test "$xfrm_msg" != ""
     then
-       echo -n $xfrm_msg
+       echo "$xfrm_msg"
     fi
 fi
 diff ${GIT_DIFF_OPTS-'-pu'} -L "a/$name1" -L "b/$name2" "$tmp1" "$tmp2"