Merge branch 'sd/t3200-branch-m-test'

diff --git a/t/t4051-diff-function-context.sh b/t/t4051-diff-function-context.sh
index 6154acb4569eb452f4e19a40ba40e19703ecca88..3e6b485ecba1a59e3d69edc3ac5a6f0f1d327bd3 100755 (executable)
--- a/t/t4051-diff-function-context.sh
+++ b/t/t4051-diff-function-context.sh
@@ -72,7 +72,8 @@ test_expect_success 'setup' '
 
        # overlap function context of 1st change and -u context of 2nd change
        grep -v "delete me from hello" <"$dir/hello.c" >file.c &&
-       sed 2p <"$dir/dummy.c" >>file.c &&
+       sed "2a\\
+            extra line" <"$dir/dummy.c" >>file.c &&
        commit_and_tag changed_hello_dummy file.c &&
 
        git checkout initial &&