development/gitg
development/gitg
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/gitg synced 2024-06-30 23:29:33 +00:00
Code Issues Projects Releases Wiki Activity

fix conflict style in tests

Browse Source
This commit is contained in:
Alberto Fanjul 2019-05-23 09:39:21 +02:00
parent ceff68c667
commit 04002dd145
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/gitg/test-cherry-pick-commit.vala
View File

@ -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");

6
tests/gitg/test-merge-ref.vala
View File

@ -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");