diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2023-02-19 14:47:07 +1100 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2023-02-19 15:48:09 +1100 |
| commit | b5e325b0a487f9ae6122d8410c393f60ea40251d (patch) | |
| tree | 16f077d7311e4a6b5432f232ce31b774323e6465 /test | |
| parent | 88c76868ba8877bf3a22dcb0c11c12e780e7273d (diff) | |
migrate revert merge test
Diffstat (limited to 'test')
38 files changed, 0 insertions, 98 deletions
diff --git a/test/integration/mergeConflictRevert/expected/repo/.git_keep/COMMIT_EDITMSG b/test/integration/mergeConflictRevert/expected/repo/.git_keep/COMMIT_EDITMSG deleted file mode 100644 index 9daeafb98..000000000 --- a/test/integration/mergeConflictRevert/expected/repo/.git_keep/COMMIT_EDITMSG +++ /dev/null @@ -1 +0,0 @@ -test diff --git a/test/integration/mergeConflictRevert/expected/repo/.git_keep/FETCH_HEAD b/test/integration/mergeConflictRevert/expected/repo/.git_keep/FETCH_HEAD deleted file mode 100644 index e69de29bb..000000000 --- a/test/integration/mergeConflictRevert/expected/repo/.git_keep/FETCH_HEAD +++ /dev/null diff --git a/test/integration/mergeConflictRevert/expected/repo/.git_keep/HEAD b/test/integration/mergeConflictRevert/expected/repo/.git_keep/HEAD deleted file mode 100644 index 0ca960536..000000000 --- a/test/integration/mergeConflictRevert/expected/repo/.git_keep/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/other diff --git a/test/integration/mergeConflictRevert/expected/repo/.git_keep/ORIG_HEAD b/test/integration/mergeConflictRevert/expected/repo/.git_keep/ORIG_HEAD deleted file mode 100644 index bf57b6527..000000000 --- a/test/integration/mergeConflictRevert/expected/repo/.git_keep/ORIG_HEAD +++ /dev/null @@ -1 +0,0 @@ -e5265503c8aea2860fc4754c1025e4597530ce0e diff --git a/test/integration/mergeConflictRevert/expected/repo/.git_keep/config b/test/integration/mergeConflictRevert/expected/repo/.git_keep/config deleted file mode 100644 index 8ae104545..000000000 --- a/test/integration/mergeConflictRevert/expected/repo/.git_keep/config +++ /dev/null @@ -1,10 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = false - logallrefupdates = true - ignorecase = true - precomposeunicode = true -[user] - email = CI@example.com - name = CI diff --git a/test/integration/mergeConflictRevert/expected/repo/.git_keep/description b/test/integration/mergeConflictRevert/expected/repo/.git_keep/description deleted file mode 100644 index 498b267a8..000000000 --- a/test/integration/mergeConflictRevert/expected/repo/.git_keep/description +++ /dev/null @@ -1 +0,0 @@ -Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/mergeConflictRevert/expected/repo/.git_keep/index b/test/integration/mergeConflictRevert/expected/repo/.git_keep/index Binary files differdeleted file mode 100644 index 7b55ac988..000000000 --- a/test/integration/mergeConflictRevert/expected/repo/.git_keep/index +++ /dev/null diff --git a/test/integration/mergeConflictRevert/expected/repo/.git_keep/info/exclude b/test/integration/mergeConflictRevert/expected/repo/.git_keep/info/exclude deleted file mode 100644 index 8e9f2071f..000000000 --- a/test/integration/mergeConflictRevert/expected/repo/.git_keep/info/exclude +++ /dev/null @@ -1,7 +0,0 @@ -# git ls-files --others --exclude-from=.git/info/exclude -# Lines that start with '#' are comments. -# For a project mostly in C, the following would be a good set of -# exclude patterns (uncomment them if you want to use them): -# *.[oa] -# *~ -.DS_Store diff --git a/test/integration/mergeConflictRevert/expected/repo/.git_keep/logs/HEAD b/test/integration/mergeConflictRevert/expected/repo/.git_keep/logs/HEAD deleted file mode 100644 index d2c3533b1..000000000 --- a/test/integration/mergeConflictRevert/expected/repo/.git_keep/logs/HEAD +++ /dev/null @@ -1,12 +0,0 @@ -0000000000000000000000000000000000000000 d3b35176a575d48743900b1f0863cefbc198f84c CI <CI@example.com> 1622875852 +1000 commit (initial): test 1 -d3b35176a575d48743900b1f0863cefbc198f84c d3b35176a575d48743900b1f0863cefbc198f84c CI <CI@example.com> 1622875853 +1000 checkout: moving from master to other -d3b35176a575d48743900b1f0863cefbc198f84c 3c3594b2fd655fb7ffe36077ee8a9c3f79fb5fc6 CI <CI@example.com> 1622875853 +1000 commit: test 2 -3c3594b2fd655fb7ffe36077ee8a9c3f79fb5fc6 3c3594b2fd655fb7ffe36077ee8a9c3f79fb5fc6 CI <CI@example.com> 1622875853 +1000 checkout: moving from other to another -3c3594b2fd655fb7ffe36077ee8a9c3f79fb5fc6 1e7d643e0db24ebee10f92aa2f8099d50dbe0f0f CI <CI@example.com> 1622875853 +1000 commit: test 3 -1e7d643e0db24ebee10f92aa2f8099d50dbe0f0f 3c3594b2fd655fb7ffe36077ee8a9c3f79fb5fc6 CI <CI@example.com> 1622875853 +1000 checkout: moving from another to other -3c3594b2fd655fb7ffe36077ee8a9c3f79fb5fc6 fa0b6bf64815f57729716334319596c926b6564a CI <CI@example.com> 1622875853 +1000 commit: test 4 -fa0b6bf64815f57729716334319596c926b6564a ba4581dc53b5b2ff56803651dfd79245203d546b CI <CI@example.com> 1622875853 +1000 merge another: Merge made by the 'recursive' strategy. -ba4581dc53b5b2ff56803651dfd79245203d546b a4942a576eec3a1a15fb790c942b6860331bee32 CI <CI@example.com> 1622875853 +1000 commit: test 5 -a4942a576eec3a1a15fb790c942b6860331bee32 e5265503c8aea2860fc4754c1025e4597530ce0e CI <CI@example.com> 1622875856 +1000 revert: Revert "Merge branch 'another' into other" -e5265503c8aea2860fc4754c1025e4597530ce0e a4942a576eec3a1a15fb790c942b6860331bee32 CI <CI@example.com> 1622875860 +1000 reset: moving to a4942a576eec3a1a15fb790c942b6860331bee32 -a4942a576eec3a1a15fb790c942b6860331bee32 ddad764e9e78b555cd41e5e81f8ce969cfa3972c CI <CI@example.com> 1622875862 +1000 commit: test diff --git a/test/integration/mergeConflictRevert/expected/repo/.git_keep/logs/refs/heads/another b/test/integration/mergeConflictRevert/expected/repo/.git_keep/logs/refs/heads/another deleted file mode 100644 index 0c750bad0..000000000 --- a/test/integration/mergeConflictRevert/expected/repo/.git_keep/logs/refs/heads/another +++ /dev/null @@ -1,2 +0,0 @@ -0000000000000000000000000000000000000000 3c3594b2fd655fb7ffe36077ee8a9c3f79fb5fc6 CI <CI@example.com> 1622875853 +1000 branch: Created from HEAD -3c3594b2fd655fb7ffe36077ee8a9c3f79fb5fc6 1e7d643e0db24ebee10f92aa2f8099d50dbe0f0f CI <CI@example.com> 1622875853 +1000 commit: test 3 diff --git a/test/integration/mergeConflictRevert/expected/repo/.git_keep/logs/refs/heads/master b/test/integration/mergeConflictRevert/expected/repo/.git_keep/logs/refs/heads/master deleted file mode 100644 index 63a4baf99..000000000 --- a/test/integration/mergeConflictRevert/expected/repo/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 d3b35176a575d48743900b1f0863cefbc198f84c CI <CI@example.com> 1622875852 +1000 commit (initial): test 1 diff --git a/test/integration/mergeConflictRevert/expected/repo/.git_keep/logs/refs/heads/other b/test/integration/mergeConflictRevert/expected/repo/.git_keep/logs/refs/heads/other deleted file mode 100644 index 3d3e05626..000000000 --- a/test/integration/mergeConflictRevert/expected/repo/.git_keep/logs/refs/heads/other +++ /dev/null @@ -1,8 +0,0 @@ -0000000000000000000000000000000000000000 d3b35176a575d48743900b1f0863cefbc198f84c CI <CI@example.com> 1622875853 +1000 branch: Created from HEAD -d3b35176a575d48743900b1f0863cefbc198f84c 3c3594b2fd655fb7ffe36077ee8a9c3f79fb5fc6 CI <CI@example.com> 1622875853 +1000 commit: test 2 -3c3594b2fd655fb7ffe36077ee8a9c3f79fb5fc6 fa0b6bf64815f57729716334319596c926b6564a CI <CI@example.com> 1622875853 +1000 commit: test 4 -fa0b6bf64815f57729716334319596c926b6564a ba4581dc53b5b2ff56803651dfd79245203d546b CI <CI@example.com> 1622875853 +1000 merge another: Merge made by the 'recursive' strategy. -ba4581dc53b5b2ff56803651dfd79245203d546b a4942a576eec3a1a15fb790c942b6860331bee32 CI <CI@example.com> 1622875853 +1000 commit: test 5 -a4942a576eec3a1a15fb790c942b6860331bee32 e5265503c8aea2860fc4754c1025e4597530ce0e CI <CI@example.com> 1622875856 +1000 revert: Revert "Merge branch 'another' into other" -e5265503c8aea2860fc4754c1025e4597530ce0e a4942a576eec3a1a15fb790c942b6860331bee32 CI <CI@example.com> 1622875860 +1000 reset: moving to a4942a576eec3a1a15fb790c942b6860331bee32 -a4942a576eec3a1a15fb790c942b6860331bee32 ddad764e9e78b555cd41e5e81f8ce969cfa3972c CI <CI@example.com> 1622875862 +1000 commit: test diff --git a/test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/1e/7d643e0db24ebee10f92aa2f8099d50dbe0f0f b/test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/1e/7d643e0db24ebee10f92aa2f8099d50dbe0f0f Binary files differdeleted file mode 100644 index 9bc4b492b..000000000 --- a/test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/1e/7d643e0db24ebee10f92aa2f8099d50dbe0f0f +++ /dev/null diff --git a/test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/3c/3594b2fd655fb7ffe36077ee8a9c3f79fb5fc6 b/test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/3c/3594b2fd655fb7ffe36077ee8a9c3f79fb5fc6 Binary files differdeleted file mode 100644 index 94a4067b7..000000000 --- a/test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/3c/3594b2fd655fb7ffe36077ee8a9c3f79fb5fc6 +++ /dev/null diff --git a/test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/41/bed9f222cc54e68d7846dc010bea6d23bea33e b/test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/41/bed9f222cc54e68d7846dc010bea6d23bea33e Binary files differdeleted file mode 100644 index 823da94ec..000000000 --- a/test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/41/bed9f222cc54e68d7846dc010bea6d23bea33e +++ /dev/null diff --git a/test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/61/3e54e7fd6e080d53ef44c18ecd33c545ac0e08 b/test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/61/3e54e7fd6e080d53ef44c18ecd33c545ac0e08 Binary files differdeleted file mode 100644 index 82182cab4..000000000 --- a/test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/61/3e54e7fd6e080d53ef44c18ecd33c545ac0e08 +++ /dev/null diff --git a/test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/89/8618af3fef6edf472d0f4a483ed8010d7bcfbb b/test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/89/8618af3fef6edf472d0f4a483ed8010d7bcfbb Binary files differdeleted file mode 100644 index 3f22e7000..000000000 --- a/test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/89/8618af3fef6edf472d0f4a483ed8010d7bcfbb +++ /dev/null diff --git a/test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/98/f656b294e5f3b447e3fd66814a80d0d4080627 b/test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/98/f656b294e5f3b447e3fd66814a80d0d4080627 Binary files differdeleted file mode 100644 index ea393ce6b..000000000 --- a/test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/98/f656b294e5f3b447e3fd66814a80d0d4080627 +++ /dev/null diff --git a/test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/9d/aeafb9864cf43055ae93beb0afd6c7d144bfa4 b/test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/9d/aeafb9864cf43055ae93beb0afd6c7d144bfa4 Binary files differdeleted file mode 100644 index 4667dcf6f..000000000 --- a/test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/9d/aeafb9864cf43055ae93beb0afd6c7d144bfa4 +++ /dev/null diff --git a/test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/a4/942a576eec3a1a15fb790c942b6860331bee32 b/test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/a4/942a576eec3a1a15fb790c942b6860331bee32 deleted file mode 100644 index 4af7a4f8b..000000000 --- a/test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/a4/942a576eec3a1a15fb790c942b6860331bee32 +++ /dev/null @@ -1,2 +0,0 @@ -xK -1]әDWst҃q17GpEQ`;]DY&/cIe(`f*R - yhka',,#:϶.5$U A?p|m{ꩬ -"Aǩ )9
\ No newline at end of file diff --git a/test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/a7/fd052c52f174943cdea637f2d11f5ab7d090cd b/test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/a7/fd052c52f174943cdea637f2d11f5ab7d090cd Binary files differdeleted file mode 100644 index 54af6d3b3..000000000 --- a/test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/a7/fd052c52f174943cdea637f2d11f5ab7d090cd +++ /dev/null diff --git a/test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/ba/4581dc53b5b2ff56803651dfd79245203d546b b/test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/ba/4581dc53b5b2ff56803651dfd79245203d546b Binary files differdeleted file mode 100644 index f2995f300..000000000 --- a/test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/ba/4581dc53b5b2ff56803651dfd79245203d546b +++ /dev/null diff --git a/test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/be/5b46b808c9c808be26710daeb2ce9ed2c7a070 b/test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/be/5b46b808c9c808be26710daeb2ce9ed2c7a070 Binary files differdeleted file mode 100644 index 5a34d287e..000000000 --- a/test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/be/5b46b808c9c808be26710daeb2ce9ed2c7a070 +++ /dev/null diff --git a/test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/c5/af43f6cc1d51ebb3ab4800347595541f81799c b/test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/c5/af43f6cc1d51ebb3ab4800347595541f81799c Binary files differdeleted file mode 100644 index a11ab4a6c..000000000 --- a/test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/c5/af43f6cc1d51ebb3ab4800347595541f81799c +++ /dev/null diff --git a/test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/d3/b35176a575d48743900b1f0863cefbc198f84c b/test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/d3/b35176a575d48743900b1f0863cefbc198f84c Binary files differdeleted file mode 100644 index a2cdf6ec8..000000000 --- a/test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/d3/b35176a575d48743900b1f0863cefbc198f84c +++ /dev/null diff --git a/test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/dd/ad764e9e78b555cd41e5e81f8ce969cfa3972c b/test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/dd/ad764e9e78b555cd41e5e81f8ce969cfa3972c deleted file mode 100644 index 2d746cac5..000000000 --- a/test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/dd/ad764e9e78b555cd41e5e81f8ce969cfa3972c +++ /dev/null @@ -1,2 +0,0 @@ -xM -1 @a=E$m f5Hcuw-,?łZ!n(7Bs
D(`˘Ja9RTHk9XU3el|/'Ybt.'#ugn8
\ No newline at end of file diff --git a/test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/e5/265503c8aea2860fc4754c1025e4597530ce0e b/test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/e5/265503c8aea2860fc4754c1025e4597530ce0e deleted file mode 100644 index cde3bd747..000000000 --- a/test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/e5/265503c8aea2860fc4754c1025e4597530ce0e +++ /dev/null @@ -1 +0,0 @@ -xPj0Y_CKkWR)^J`%bCmY-zy1e穃#Л]R̀Frv} ћMH7Y:O2)
9$]v6S$"*|U~x}ʩ 6HhjgQ])W-MU 7^G^>J;´8m
h.c"EPG݀ӟq*#/W`A`ϯ3J>`6Cyg&*R&$' l'
\ No newline at end of file diff --git a/test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/fa/0b6bf64815f57729716334319596c926b6564a b/test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/fa/0b6bf64815f57729716334319596c926b6564a Binary files differdeleted file mode 100644 index a6bc9c709..000000000 --- a/test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/fa/0b6bf64815f57729716334319596c926b6564a +++ /dev/null diff --git a/test/integration/mergeConflictRevert/expected/repo/.git_keep/refs/heads/another b/test/integration/mergeConflictRevert/expected/repo/.git_keep/refs/heads/another deleted file mode 100644 index 24e534ce9..000000000 --- a/test/integration/mergeConflictRevert/expected/repo/.git_keep/refs/heads/another +++ /dev/null @@ -1 +0,0 @@ -1e7d643e0db24ebee10f92aa2f8099d50dbe0f0f diff --git a/test/integration/mergeConflictRevert/expected/repo/.git_keep/refs/heads/master b/test/integration/mergeConflictRevert/expected/repo/.git_keep/refs/heads/master deleted file mode 100644 index 249ffa1c2..000000000 --- a/test/integration/mergeConflictRevert/expected/repo/.git_keep/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -d3b35176a575d48743900b1f0863cefbc198f84c diff --git a/test/integration/mergeConflictRevert/expected/repo/.git_keep/refs/heads/other b/test/integration/mergeConflictRevert/expected/repo/.git_keep/refs/heads/other deleted file mode 100644 index b22b268a7..000000000 --- a/test/integration/mergeConflictRevert/expected/repo/.git_keep/refs/heads/other +++ /dev/null @@ -1 +0,0 @@ -ddad764e9e78b555cd41e5e81f8ce969cfa3972c diff --git a/test/integration/mergeConflictRevert/expected/repo/file1 b/test/integration/mergeConflictRevert/expected/repo/file1 deleted file mode 100644 index 9daeafb98..000000000 --- a/test/integration/mergeConflictRevert/expected/repo/file1 +++ /dev/null @@ -1 +0,0 @@ -test diff --git a/test/integration/mergeConflictRevert/expected/repo/file2 b/test/integration/mergeConflictRevert/expected/repo/file2 deleted file mode 100644 index 9daeafb98..000000000 --- a/test/integration/mergeConflictRevert/expected/repo/file2 +++ /dev/null @@ -1 +0,0 @@ -test diff --git a/test/integration/mergeConflictRevert/expected/repo/file4 b/test/integration/mergeConflictRevert/expected/repo/file4 deleted file mode 100644 index 9daeafb98..000000000 --- a/test/integration/mergeConflictRevert/expected/repo/file4 +++ /dev/null @@ -1 +0,0 @@ -test diff --git a/test/integration/mergeConflictRevert/expected/repo/file5 b/test/integration/mergeConflictRevert/expected/repo/file5 deleted file mode 100644 index 9daeafb98..000000000 --- a/test/integration/mergeConflictRevert/expected/repo/file5 +++ /dev/null @@ -1 +0,0 @@ -test diff --git a/test/integration/mergeConflictRevert/recording.json b/test/integration/mergeConflictRevert/recording.json deleted file mode 100644 index bbb4056aa..000000000 --- a/test/integration/mergeConflictRevert/recording.json +++ /dev/null @@ -1 +0,0 @@ -{"KeyEvents":[{"Timestamp":1730,"Mod":0,"Key":259,"Ch":0},{"Timestamp":2002,"Mod":0,"Key":259,"Ch":0},{"Timestamp":2305,"Mod":0,"Key":258,"Ch":0},{"Timestamp":2968,"Mod":0,"Key":256,"Ch":116},{"Timestamp":3402,"Mod":0,"Key":13,"Ch":13},{"Timestamp":3985,"Mod":0,"Key":257,"Ch":0},{"Timestamp":4304,"Mod":0,"Key":257,"Ch":0},{"Timestamp":5850,"Mod":0,"Key":258,"Ch":0},{"Timestamp":6785,"Mod":0,"Key":256,"Ch":103},{"Timestamp":7441,"Mod":0,"Key":13,"Ch":13},{"Timestamp":7978,"Mod":0,"Key":260,"Ch":0},{"Timestamp":8304,"Mod":0,"Key":260,"Ch":0},{"Timestamp":8585,"Mod":0,"Key":256,"Ch":99},{"Timestamp":8816,"Mod":0,"Key":256,"Ch":116},{"Timestamp":8873,"Mod":0,"Key":256,"Ch":101},{"Timestamp":9041,"Mod":0,"Key":256,"Ch":115},{"Timestamp":9081,"Mod":0,"Key":256,"Ch":116},{"Timestamp":9416,"Mod":0,"Key":13,"Ch":13},{"Timestamp":11041,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":135,"Height":74}]}
\ No newline at end of file diff --git a/test/integration/mergeConflictRevert/setup.sh b/test/integration/mergeConflictRevert/setup.sh deleted file mode 100644 index aa3eb68c7..000000000 --- a/test/integration/mergeConflictRevert/setup.sh +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/sh - -set -e - -cd $1 - -git init -git config user.email "CI@example.com" -git config user.name "CI" - -git checkout -b master - -echo "test" > file1 -git add . -git commit -m "test 1" - -git checkout -b other - -echo "test" > file2 -git add . -git commit -m "test 2" - -git checkout -b another - -echo "test" > file3 -git add . -git commit -m "test 3" - -git checkout other - -echo "test" > file4 -git add . -git commit -m "test 4" - -git merge another - -echo "test" > file5 -git add . -git commit -m "test 5" - diff --git a/test/integration/mergeConflictRevert/test.json b/test/integration/mergeConflictRevert/test.json deleted file mode 100644 index d6ccd0d39..000000000 --- a/test/integration/mergeConflictRevert/test.json +++ /dev/null @@ -1 +0,0 @@ -{ "description": "In this test we revert a merge conflict, choosing which parent we want to retain... or something like that. We need to rename the newly created commit so that we don't fail on the snapshot comparison", "speed": 10 } |