From 04002dd145bfe9150f4f3f8707db908351928d12 Mon Sep 17 00:00:00 2001 From: Alberto Fanjul Date: Thu, 23 May 2019 09:39:21 +0200 Subject: [PATCH] fix conflict style in tests --- tests/gitg/test-cherry-pick-commit.vala | 6 +++--- tests/gitg/test-merge-ref.vala | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/gitg/test-cherry-pick-commit.vala b/tests/gitg/test-cherry-pick-commit.vala index ee1959cd..8634759e 100644 --- a/tests/gitg/test-cherry-pick-commit.vala +++ b/tests/gitg/test-cherry-pick-commit.vala @@ -222,7 +222,7 @@ class Gitg.Test.CherryPickCommit : Application assert_file_contents("a", "a file\n"); assert_file_contents("b", "b file\n"); - assert_file_contents("c", "<<<<<<< ours\nc file other content\n=======\nc file\n>>>>>>> theirs\n"); + assert_file_contents("c", "<<<<<<< ours\nc file other content\n|||||||\n=======\nc file\n>>>>>>> theirs\n"); assert_file_contents(".git/CHERRY_PICK_HEAD", "72af7ccf47852d832b06c7244de8ae9ded639024\n"); } @@ -333,7 +333,7 @@ class Gitg.Test.CherryPickCommit : Application assert_file_contents("a", "a file\n"); assert_file_contents("b", "b file\n"); - assert_file_contents("c", "<<<<<<< ours\nc file other content\n=======\nc file\n>>>>>>> theirs\n"); + assert_file_contents("c", "<<<<<<< ours\nc file other content\n|||||||\n=======\nc file\n>>>>>>> theirs\n"); assert_file_contents(".git/CHERRY_PICK_HEAD", "72af7ccf47852d832b06c7244de8ae9ded639024\n"); } @@ -391,7 +391,7 @@ class Gitg.Test.CherryPickCommit : Application assert_file_contents("a", "a file\n"); assert_file_contents("b", "b file\n"); - assert_file_contents("c", "<<<<<<< ours\nc file other content\n=======\nc file\n>>>>>>> theirs\n"); + assert_file_contents("c", "<<<<<<< ours\nc file other content\n|||||||\n=======\nc file\n>>>>>>> theirs\n"); assert_file_contents(".git/CHERRY_PICK_HEAD", "72af7ccf47852d832b06c7244de8ae9ded639024\n"); diff --git a/tests/gitg/test-merge-ref.vala b/tests/gitg/test-merge-ref.vala index 13137c34..dc8d23bf 100644 --- a/tests/gitg/test-merge-ref.vala +++ b/tests/gitg/test-merge-ref.vala @@ -217,7 +217,7 @@ class Gitg.Test.MergeRef : Application assert_file_contents("a", "a file\n"); assert_file_contents("b", "b file\n"); - assert_file_contents("c", "<<<<<<< ours\nc file other content\n=======\nc file\n>>>>>>> theirs\n"); + assert_file_contents("c", "<<<<<<< ours\nc file other content\n|||||||\n=======\nc file\n>>>>>>> theirs\n"); assert_file_contents(".git/ORIG_HEAD", "e1219dd5fbcf8fb5b17bbd3db7a9fa88e98d6651\n"); assert_file_contents(".git/MERGE_HEAD", "72af7ccf47852d832b06c7244de8ae9ded639024\n"); @@ -331,7 +331,7 @@ class Gitg.Test.MergeRef : Application assert_file_contents("a", "a file\n"); assert_file_contents("b", "b file\n"); - assert_file_contents("c", "<<<<<<< ours\nc file other content\n=======\nc file\n>>>>>>> theirs\n"); + assert_file_contents("c", "<<<<<<< ours\nc file other content\n|||||||\n=======\nc file\n>>>>>>> theirs\n"); assert_file_contents(".git/ORIG_HEAD", "e1219dd5fbcf8fb5b17bbd3db7a9fa88e98d6651\n"); assert_file_contents(".git/MERGE_HEAD", "72af7ccf47852d832b06c7244de8ae9ded639024\n"); @@ -394,7 +394,7 @@ class Gitg.Test.MergeRef : Application assert_file_contents("a", "a file\n"); assert_file_contents("b", "b file\n"); - assert_file_contents("c", "<<<<<<< ours\nc file other content\n=======\nc file\n>>>>>>> theirs\n"); + assert_file_contents("c", "<<<<<<< ours\nc file other content\n|||||||\n=======\nc file\n>>>>>>> theirs\n"); assert_file_contents(".git/ORIG_HEAD", "e1219dd5fbcf8fb5b17bbd3db7a9fa88e98d6651\n"); assert_file_contents(".git/MERGE_HEAD", "72af7ccf47852d832b06c7244de8ae9ded639024\n");