Signed-off-by: SZEDER Gábor <szeder@xxxxxxxxxx> --- t/t6200-fmt-merge-msg.sh | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/t/t6200-fmt-merge-msg.sh b/t/t6200-fmt-merge-msg.sh index 526d7d1..1af3ab2 100755 --- a/t/t6200-fmt-merge-msg.sh +++ b/t/t6200-fmt-merge-msg.sh @@ -69,7 +69,7 @@ test_expect_success setup ' git show-branch ' -cat >expected <<\EOF +cat >msg.left.nolog <<\EOF Merge branch 'left' EOF @@ -79,10 +79,10 @@ test_expect_success 'merge-msg test #1' ' git fetch . left && git fmt-merge-msg <.git/FETCH_HEAD >actual && - git diff actual expected + git diff actual msg.left.nolog ' -cat >expected <<\EOF +cat >msg.left_trash <<\EOF Merge branch 'left' of ../trash EOF @@ -92,10 +92,10 @@ test_expect_success 'merge-msg test #2' ' git fetch ../trash left && git fmt-merge-msg <.git/FETCH_HEAD >actual && - git diff actual expected + git diff actual msg.left_trash ' -cat >expected <<\EOF +cat >msg.left.log <<\EOF Merge branch 'left' * left: @@ -115,10 +115,10 @@ test_expect_success 'merge-msg test #3' ' git fetch . left && git fmt-merge-msg <.git/FETCH_HEAD >actual && - git diff actual expected + git diff actual msg.left.log ' -cat >expected <<\EOF +cat >msg.left_right.log <<\EOF Merge branches 'left' and 'right' * left: @@ -145,7 +145,7 @@ test_expect_success 'merge-msg test #4' ' git fetch . left right && git fmt-merge-msg <.git/FETCH_HEAD >actual && - git diff actual expected + git diff actual msg.left_right.log ' test_expect_success 'merge-msg test #5' ' @@ -157,7 +157,7 @@ test_expect_success 'merge-msg test #5' ' git fetch . left right && git fmt-merge-msg <.git/FETCH_HEAD >actual && - git diff actual expected + git diff actual msg.left_right.log ' test_done -- 1.5.5.76.g546c -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
