Merge branch 'rj/test-fixes'

[thirdparty/git.git] / t / t3032-merge-recursive-options.sh

diff --git a/t/t3032-merge-recursive-options.sh b/t/t3032-merge-recursive-options.sh
index 29e049af55615fdaa23960e25eb2c2eb9374db58..44f5421be45579b10c5556a958404ad2daa02002 100755 (executable)
--- a/t/t3032-merge-recursive-options.sh
+++ b/t/t3032-merge-recursive-options.sh
@@ -19,13 +19,13 @@ test_have_prereq MINGW && export GREP_OPTIONS=-U
 test_expect_success 'setup' '
        conflict_hunks () {
                sed $SED_OPTIONS -n -e "
-                       /^<<<</ b inconflict
+                       /^<<<</ b conflict
                        b
-                       : inconflict
+                       : conflict
                        p
                        /^>>>>/ b
                        n
-                       b inconflict
+                       b conflict
                " "$@"
        } &&