diff options
Diffstat (limited to 't/t3032-merge-recursive-options.sh')
| -rwxr-xr-x | t/t3032-merge-recursive-options.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/t/t3032-merge-recursive-options.sh b/t/t3032-merge-recursive-options.sh index 29e049af55..44f5421be4 100755 --- 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 " "$@" } && |