apply: --3way with add/add conflict

diff --git a/t/t4016-diff-quote.sh b/t/t4016-diff-quote.sh
index 3ec71184bac00c956b48ddc3f6c51a37cabcbbf2..97b81778cb8c9f3c06b551b1f7031c944ced70d0 100755 (executable)
--- a/t/t4016-diff-quote.sh
+++ b/t/t4016-diff-quote.sh
@@ -73,13 +73,13 @@ test_expect_success TABS_IN_FILENAMES 'git diff --numstat -M HEAD' '
 
 test_expect_success TABS_IN_FILENAMES 'git diff --stat -M HEAD' '
        cat >expect <<-\EOF &&
-        pathname.1 => "Rpathname\twith HT.0"            |    0
-        pathname.3 => "Rpathname\nwith LF.0"            |    0
-        "pathname\twith HT.3" => "Rpathname\nwith LF.1" |    0
-        pathname.2 => Rpathname with SP.0               |    0
-        "pathname\twith HT.2" => Rpathname with SP.1    |    0
-        pathname.0 => Rpathname.0                       |    0
-        "pathname\twith HT.0" => Rpathname.1            |    0
+        pathname.1 => "Rpathname\twith HT.0"            | 0
+        pathname.3 => "Rpathname\nwith LF.0"            | 0
+        "pathname\twith HT.3" => "Rpathname\nwith LF.1" | 0
+        pathname.2 => Rpathname with SP.0               | 0
+        "pathname\twith HT.2" => Rpathname with SP.1    | 0
+        pathname.0 => Rpathname.0                       | 0
+        "pathname\twith HT.0" => Rpathname.1            | 0
         7 files changed, 0 insertions(+), 0 deletions(-)
        EOF
        git diff --stat -M HEAD >actual &&