checkout -m --conflict=diff3: add a label for ancestor

diff --git a/t/t9101-git-svn-props.sh b/t/t9101-git-svn-props.sh
index 9da4178c94f4bde62f69f32701b16ab3d04524e0..929499e996bc33d96ebab0b01ebcac8240e689b7 100755 (executable)
--- a/t/t9101-git-svn-props.sh
+++ b/t/t9101-git-svn-props.sh
@@ -142,7 +142,9 @@ test_expect_success 'test show-ignore' "
        touch deeply/nested/directory/.keep &&
        svn_cmd add deeply &&
        svn_cmd up &&
-       svn_cmd propset -R svn:ignore 'no-such-file*' .
+       svn_cmd propset -R svn:ignore '
+no-such-file*
+' .
        svn_cmd commit -m 'propset svn:ignore'
        cd .. &&
        git svn show-ignore > show-ignore.got &&
@@ -171,6 +173,7 @@ test_expect_success 'test create-ignore' "
        "
 
 cat >prop.expect <<\EOF
+
 no-such-file*
 
 EOF