diff options
Diffstat (limited to 'third_party/git/t/t6026-merge-attr.sh')
| -rwxr-xr-x | third_party/git/t/t6026-merge-attr.sh | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/third_party/git/t/t6026-merge-attr.sh b/third_party/git/t/t6026-merge-attr.sh index 5900358ce9c0..8f9b48a4937b 100755 --- a/third_party/git/t/t6026-merge-attr.sh +++ b/third_party/git/t/t6026-merge-attr.sh @@ -32,29 +32,7 @@ test_expect_success setup ' test_tick && git commit -m Side && - git tag anchor && - - cat >./custom-merge <<-\EOF && - #!/bin/sh - - orig="$1" ours="$2" theirs="$3" exit="$4" path=$5 - ( - echo "orig is $orig" - echo "ours is $ours" - echo "theirs is $theirs" - echo "path is $path" - echo "=== orig ===" - cat "$orig" - echo "=== ours ===" - cat "$ours" - echo "=== theirs ===" - cat "$theirs" - ) >"$ours+" - cat "$ours+" >"$ours" - rm -f "$ours+" - exit "$exit" - EOF - chmod +x ./custom-merge + git tag anchor ' test_expect_success merge ' @@ -104,6 +82,28 @@ test_expect_success 'retry the merge with longer context' ' grep "<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<" actual ' +cat >./custom-merge <<\EOF +#!/bin/sh + +orig="$1" ours="$2" theirs="$3" exit="$4" path=$5 +( + echo "orig is $orig" + echo "ours is $ours" + echo "theirs is $theirs" + echo "path is $path" + echo "=== orig ===" + cat "$orig" + echo "=== ours ===" + cat "$ours" + echo "=== theirs ===" + cat "$theirs" +) >"$ours+" +cat "$ours+" >"$ours" +rm -f "$ours+" +exit "$exit" +EOF +chmod +x ./custom-merge + test_expect_success 'custom merge backend' ' echo "* merge=union" >.gitattributes && |