go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2024-11-24 08:52:21 +02:00
Code Issues Releases Activity

add merge conflict undo integration test

Browse Source
This commit is contained in:
Jesse Duffield 2021-04-02 10:28:59 +11:00
parent 035726f650
commit bdf2b2d5c4
108 changed files with 381 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
test/integration/mergeConflictUndo/expected/.git_keep/COMMIT_EDITMSG Normal file
View File

@ -0,0 +1,35 @@
Merge branch 'develop' into other_branch
# Conflicts:
# directory/file
# directory/file2
# file1
# file3
# file4
# file5
#
# It looks like you may be committing a merge.
# If this is not correct, please remove the file
# /Users/jesseduffieldduffield/go/src/github.com/jesseduffield/lazygit/test/integration/mergeConflictUndo/actual/.git/MERGE_HEAD
# and try again.
# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
#
# On branch other_branch
# All conflicts fixed but you are still merging.
#
# Changes to be committed:
# new file: cherrypicking1
# new file: cherrypicking2
# new file: cherrypicking3
# new file: cherrypicking4
# new file: cherrypicking5
# new file: cherrypicking6
# new file: cherrypicking7
# new file: cherrypicking8
# new file: cherrypicking9
# modified: directory/file
# modified: file1
#

0
test/integration/mergeConflictUndo/expected/.git_keep/FETCH_HEAD Normal file
View File

1
test/integration/mergeConflictUndo/expected/.git_keep/HEAD Normal file
View File

@ -0,0 +1 @@
ref: refs/heads/other_branch

1
test/integration/mergeConflictUndo/expected/.git_keep/ORIG_HEAD Normal file
View File

@ -0,0 +1 @@
ab172f11e9d1ffc28e53b7c5504f173bf1b27527

10
test/integration/mergeConflictUndo/expected/.git_keep/config Normal file
View File

@ -0,0 +1,10 @@
[core]
repositoryformatversion = 0
filemode = true
bare = false
logallrefupdates = true
ignorecase = true
precomposeunicode = true
[user]
email = CI@example.com
name = CI

1
test/integration/mergeConflictUndo/expected/.git_keep/description Normal file
View File

@ -0,0 +1 @@
Unnamed repository; edit this file 'description' to name the repository.

BIN
test/integration/mergeConflictUndo/expected/.git_keep/index Normal file
View File

Binary file not shown.

7
test/integration/mergeConflictUndo/expected/.git_keep/info/exclude Normal file
View File

@ -0,0 +1,7 @@
# 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

34
test/integration/mergeConflictUndo/expected/.git_keep/logs/HEAD Normal file
View File

@ -0,0 +1,34 @@
0000000000000000000000000000000000000000 db35d1bf1bfbb57b4b345ee4f6f0554e9e72b015 CI <CI@example.com> 1617319581 +1100 commit (initial): first commit
db35d1bf1bfbb57b4b345ee4f6f0554e9e72b015 db35d1bf1bfbb57b4b345ee4f6f0554e9e72b015 CI <CI@example.com> 1617319581 +1100 checkout: moving from master to feature/cherry-picking
db35d1bf1bfbb57b4b345ee4f6f0554e9e72b015 1e953a069f4b657c300ea0464ecc13f9c2e34905 CI <CI@example.com> 1617319581 +1100 commit: first commit freshman year
1e953a069f4b657c300ea0464ecc13f9c2e34905 58151e1e14571021b5d38d941538a2e3c3d0e7a9 CI <CI@example.com> 1617319581 +1100 commit: second commit subway eat fresh
58151e1e14571021b5d38d941538a2e3c3d0e7a9 289b2994fdad04740a383797513c39dd183c87d3 CI <CI@example.com> 1617319581 +1100 commit: third commit fresh
289b2994fdad04740a383797513c39dd183c87d3 36d36a1d6a6e1fb7305747cf1cfedac0d3826e3e CI <CI@example.com> 1617319581 +1100 commit: fourth commit cool
36d36a1d6a6e1fb7305747cf1cfedac0d3826e3e 7f983b882d71782f6520493b14e45b1eb3888a57 CI <CI@example.com> 1617319581 +1100 commit: fifth commit nice
7f983b882d71782f6520493b14e45b1eb3888a57 8146e9924caf0aa2d21db44095ae5a0b0f6e1ce4 CI <CI@example.com> 1617319581 +1100 commit: sixth commit haha
8146e9924caf0aa2d21db44095ae5a0b0f6e1ce4 2c2a4608db50f4c6df0e4580119fd2627d160acd CI <CI@example.com> 1617319581 +1100 commit: seventh commit yeah
2c2a4608db50f4c6df0e4580119fd2627d160acd 7d80e0ed109e6802aa1f23a473200c9af3f8cf61 CI <CI@example.com> 1617319581 +1100 commit: eighth commit woo
7d80e0ed109e6802aa1f23a473200c9af3f8cf61 7d80e0ed109e6802aa1f23a473200c9af3f8cf61 CI <CI@example.com> 1617319581 +1100 checkout: moving from feature/cherry-picking to develop
7d80e0ed109e6802aa1f23a473200c9af3f8cf61 e503834faae098b6e456c2e2ab921737b3fd957c CI <CI@example.com> 1617319581 +1100 commit: first commit on develop
e503834faae098b6e456c2e2ab921737b3fd957c db35d1bf1bfbb57b4b345ee4f6f0554e9e72b015 CI <CI@example.com> 1617319581 +1100 checkout: moving from develop to master
db35d1bf1bfbb57b4b345ee4f6f0554e9e72b015 cad08b7e2fbbabb2235cc4ca7785f8ba00247d50 CI <CI@example.com> 1617319581 +1100 commit: first commit on master
cad08b7e2fbbabb2235cc4ca7785f8ba00247d50 e503834faae098b6e456c2e2ab921737b3fd957c CI <CI@example.com> 1617319581 +1100 checkout: moving from master to develop
e503834faae098b6e456c2e2ab921737b3fd957c 9e0b31da5b56c4dd7230a85fee330246c16845ac CI <CI@example.com> 1617319581 +1100 commit: second commit on develop
9e0b31da5b56c4dd7230a85fee330246c16845ac cad08b7e2fbbabb2235cc4ca7785f8ba00247d50 CI <CI@example.com> 1617319581 +1100 checkout: moving from develop to master
cad08b7e2fbbabb2235cc4ca7785f8ba00247d50 af2cd230f86b71f1b77a2b13fd090d88f13575e9 CI <CI@example.com> 1617319581 +1100 commit: second commit on master
af2cd230f86b71f1b77a2b13fd090d88f13575e9 9e0b31da5b56c4dd7230a85fee330246c16845ac CI <CI@example.com> 1617319581 +1100 checkout: moving from master to develop
9e0b31da5b56c4dd7230a85fee330246c16845ac 084111cdf3945cf795dfa651723e7e6a927e48ef CI <CI@example.com> 1617319581 +1100 commit: third commit on develop
084111cdf3945cf795dfa651723e7e6a927e48ef af2cd230f86b71f1b77a2b13fd090d88f13575e9 CI <CI@example.com> 1617319581 +1100 checkout: moving from develop to master
af2cd230f86b71f1b77a2b13fd090d88f13575e9 627a99630df8cc12c4acdebac3e3e8af1adf9711 CI <CI@example.com> 1617319581 +1100 commit: third commit on master
627a99630df8cc12c4acdebac3e3e8af1adf9711 084111cdf3945cf795dfa651723e7e6a927e48ef CI <CI@example.com> 1617319581 +1100 checkout: moving from master to develop
084111cdf3945cf795dfa651723e7e6a927e48ef 8b7aa507318e42a4efdae2c867d89590bbce48e5 CI <CI@example.com> 1617319581 +1100 commit: fourth commit on develop
8b7aa507318e42a4efdae2c867d89590bbce48e5 627a99630df8cc12c4acdebac3e3e8af1adf9711 CI <CI@example.com> 1617319581 +1100 checkout: moving from develop to master
627a99630df8cc12c4acdebac3e3e8af1adf9711 5e9fe3aa0c84eab154f6f8796804b9e2e0ab0401 CI <CI@example.com> 1617319581 +1100 commit: fourth commit on master
5e9fe3aa0c84eab154f6f8796804b9e2e0ab0401 5e9fe3aa0c84eab154f6f8796804b9e2e0ab0401 CI <CI@example.com> 1617319581 +1100 checkout: moving from master to base_branch
5e9fe3aa0c84eab154f6f8796804b9e2e0ab0401 7fdf0429a1e95f38736a260c5ed4121aa5d6e76f CI <CI@example.com> 1617319581 +1100 commit: file
7fdf0429a1e95f38736a260c5ed4121aa5d6e76f 7fdf0429a1e95f38736a260c5ed4121aa5d6e76f CI <CI@example.com> 1617319581 +1100 checkout: moving from base_branch to other_branch
7fdf0429a1e95f38736a260c5ed4121aa5d6e76f 7fdf0429a1e95f38736a260c5ed4121aa5d6e76f CI <CI@example.com> 1617319581 +1100 checkout: moving from other_branch to base_branch
7fdf0429a1e95f38736a260c5ed4121aa5d6e76f c4b40606be30048d61ed9bb55e21ecd612f34d7d CI <CI@example.com> 1617319581 +1100 commit: file changed
c4b40606be30048d61ed9bb55e21ecd612f34d7d 7fdf0429a1e95f38736a260c5ed4121aa5d6e76f CI <CI@example.com> 1617319581 +1100 checkout: moving from base_branch to other_branch
7fdf0429a1e95f38736a260c5ed4121aa5d6e76f ab172f11e9d1ffc28e53b7c5504f173bf1b27527 CI <CI@example.com> 1617319582 +1100 commit: asd
ab172f11e9d1ffc28e53b7c5504f173bf1b27527 0a71a0176c3eb0a7ccba7e8e675743aecb362f3a CI <CI@example.com> 1617319602 +1100 commit (merge): Merge branch 'develop' into other_branch

3
test/integration/mergeConflictUndo/expected/.git_keep/logs/refs/heads/base_branch Normal file
View File

@ -0,0 +1,3 @@
0000000000000000000000000000000000000000 5e9fe3aa0c84eab154f6f8796804b9e2e0ab0401 CI <CI@example.com> 1617319581 +1100 branch: Created from HEAD
5e9fe3aa0c84eab154f6f8796804b9e2e0ab0401 7fdf0429a1e95f38736a260c5ed4121aa5d6e76f CI <CI@example.com> 1617319581 +1100 commit: file
7fdf0429a1e95f38736a260c5ed4121aa5d6e76f c4b40606be30048d61ed9bb55e21ecd612f34d7d CI <CI@example.com> 1617319581 +1100 commit: file changed

5
test/integration/mergeConflictUndo/expected/.git_keep/logs/refs/heads/develop Normal file
View File

@ -0,0 +1,5 @@
0000000000000000000000000000000000000000 7d80e0ed109e6802aa1f23a473200c9af3f8cf61 CI <CI@example.com> 1617319581 +1100 branch: Created from HEAD
7d80e0ed109e6802aa1f23a473200c9af3f8cf61 e503834faae098b6e456c2e2ab921737b3fd957c CI <CI@example.com> 1617319581 +1100 commit: first commit on develop
e503834faae098b6e456c2e2ab921737b3fd957c 9e0b31da5b56c4dd7230a85fee330246c16845ac CI <CI@example.com> 1617319581 +1100 commit: second commit on develop
9e0b31da5b56c4dd7230a85fee330246c16845ac 084111cdf3945cf795dfa651723e7e6a927e48ef CI <CI@example.com> 1617319581 +1100 commit: third commit on develop
084111cdf3945cf795dfa651723e7e6a927e48ef 8b7aa507318e42a4efdae2c867d89590bbce48e5 CI <CI@example.com> 1617319581 +1100 commit: fourth commit on develop

9
test/integration/mergeConflictUndo/expected/.git_keep/logs/refs/heads/feature/cherry-picking Normal file
View File

@ -0,0 +1,9 @@
0000000000000000000000000000000000000000 db35d1bf1bfbb57b4b345ee4f6f0554e9e72b015 CI <CI@example.com> 1617319581 +1100 branch: Created from HEAD
db35d1bf1bfbb57b4b345ee4f6f0554e9e72b015 1e953a069f4b657c300ea0464ecc13f9c2e34905 CI <CI@example.com> 1617319581 +1100 commit: first commit freshman year
1e953a069f4b657c300ea0464ecc13f9c2e34905 58151e1e14571021b5d38d941538a2e3c3d0e7a9 CI <CI@example.com> 1617319581 +1100 commit: second commit subway eat fresh
58151e1e14571021b5d38d941538a2e3c3d0e7a9 289b2994fdad04740a383797513c39dd183c87d3 CI <CI@example.com> 1617319581 +1100 commit: third commit fresh
289b2994fdad04740a383797513c39dd183c87d3 36d36a1d6a6e1fb7305747cf1cfedac0d3826e3e CI <CI@example.com> 1617319581 +1100 commit: fourth commit cool
36d36a1d6a6e1fb7305747cf1cfedac0d3826e3e 7f983b882d71782f6520493b14e45b1eb3888a57 CI <CI@example.com> 1617319581 +1100 commit: fifth commit nice
7f983b882d71782f6520493b14e45b1eb3888a57 8146e9924caf0aa2d21db44095ae5a0b0f6e1ce4 CI <CI@example.com> 1617319581 +1100 commit: sixth commit haha
8146e9924caf0aa2d21db44095ae5a0b0f6e1ce4 2c2a4608db50f4c6df0e4580119fd2627d160acd CI <CI@example.com> 1617319581 +1100 commit: seventh commit yeah
2c2a4608db50f4c6df0e4580119fd2627d160acd 7d80e0ed109e6802aa1f23a473200c9af3f8cf61 CI <CI@example.com> 1617319581 +1100 commit: eighth commit woo

5
test/integration/mergeConflictUndo/expected/.git_keep/logs/refs/heads/master Normal file
View File

@ -0,0 +1,5 @@
0000000000000000000000000000000000000000 db35d1bf1bfbb57b4b345ee4f6f0554e9e72b015 CI <CI@example.com> 1617319581 +1100 commit (initial): first commit
db35d1bf1bfbb57b4b345ee4f6f0554e9e72b015 cad08b7e2fbbabb2235cc4ca7785f8ba00247d50 CI <CI@example.com> 1617319581 +1100 commit: first commit on master
cad08b7e2fbbabb2235cc4ca7785f8ba00247d50 af2cd230f86b71f1b77a2b13fd090d88f13575e9 CI <CI@example.com> 1617319581 +1100 commit: second commit on master
af2cd230f86b71f1b77a2b13fd090d88f13575e9 627a99630df8cc12c4acdebac3e3e8af1adf9711 CI <CI@example.com> 1617319581 +1100 commit: third commit on master
627a99630df8cc12c4acdebac3e3e8af1adf9711 5e9fe3aa0c84eab154f6f8796804b9e2e0ab0401 CI <CI@example.com> 1617319581 +1100 commit: fourth commit on master

3
test/integration/mergeConflictUndo/expected/.git_keep/logs/refs/heads/other_branch Normal file
View File

@ -0,0 +1,3 @@
0000000000000000000000000000000000000000 7fdf0429a1e95f38736a260c5ed4121aa5d6e76f CI <CI@example.com> 1617319581 +1100 branch: Created from HEAD
7fdf0429a1e95f38736a260c5ed4121aa5d6e76f ab172f11e9d1ffc28e53b7c5504f173bf1b27527 CI <CI@example.com> 1617319582 +1100 commit: asd
ab172f11e9d1ffc28e53b7c5504f173bf1b27527 0a71a0176c3eb0a7ccba7e8e675743aecb362f3a CI <CI@example.com> 1617319602 +1100 commit (merge): Merge branch 'develop' into other_branch

3
test/integration/mergeConflictUndo/expected/.git_keep/objects/08/4111cdf3945cf795dfa651723e7e6a927e48ef Normal file
View File

@ -0,0 +1,3 @@
x�ŽM
Â0F]ç³d¦ùk@DèªÇ˜$SZh›¢x| ^ÀíÇ{¼/•m[t„—VE Ø�=föÄi
>’×ˆÑ ëh&�µ`Hêà*{ƒ 5e¶Ñºdrö�Fîí$¢5vÆ%r½±œ¿Ú\* #܇ñ)ÞŽUn©l w6(ØžàJ„¨Îõ<ÕäO\µy©~”²¼e-‡úxÌ@

BIN
test/integration/mergeConflictUndo/expected/.git_keep/objects/09/cbe8c6717c06a61876b7b641a46a62bf3c585d Normal file
View File

Binary file not shown.

BIN
test/integration/mergeConflictUndo/expected/.git_keep/objects/0a/71a0176c3eb0a7ccba7e8e675743aecb362f3a Normal file
View File

Binary file not shown.

BIN
test/integration/mergeConflictUndo/expected/.git_keep/objects/17/3a40ed58e33060166ccbfb7d0ccc0387be5f09 Normal file
View File

Binary file not shown.

BIN
test/integration/mergeConflictUndo/expected/.git_keep/objects/17/4a8c9444cfa700682d74059d9fa9be5749242c Normal file
View File

Binary file not shown.

BIN
test/integration/mergeConflictUndo/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 Normal file
View File

Binary file not shown.

BIN
test/integration/mergeConflictUndo/expected/.git_keep/objects/18/f469bc737f6c2a589205e2ddefceb32a7cc3a7 Normal file
View File

Binary file not shown.

BIN
test/integration/mergeConflictUndo/expected/.git_keep/objects/1b/9ae5f5dff631baaa180a30afd9983f83dc27ca Normal file
View File

Binary file not shown.

2
test/integration/mergeConflictUndo/expected/.git_keep/objects/1e/953a069f4b657c300ea0464ecc13f9c2e34905 Normal file
View File

@ -0,0 +1,2 @@
x�ŽË
Â0E]ç+f/H&�Ö‚ˆàªŸ1“ÞPÁØ#èß[ð„»:œ7-¥Ü9ö»VrH HÁØÉg×A=Ä¥¤�fH9šU*�&õqbÍÛTc¯A}ˆ@È]¶1 è�ZŽF^m^*]G:]Ç ÞRÖ;i)gâŽ{ÏC<2í™­5ÝN5ü©›|«ÏF¿ŠrÅs.ò ¤š/…Cô

BIN
test/integration/mergeConflictUndo/expected/.git_keep/objects/20/85c8dd0a80e95ed959e4db2ab98f66b970ad77 Normal file
View File

Binary file not shown.

BIN
test/integration/mergeConflictUndo/expected/.git_keep/objects/21/78af7503938665881174069be4d48fa483e4af Normal file
View File

Binary file not shown.

BIN
test/integration/mergeConflictUndo/expected/.git_keep/objects/22/b0fd807dd5e428c2d818aef6a2311d7c11e885 Normal file
View File

Binary file not shown.

BIN
test/integration/mergeConflictUndo/expected/.git_keep/objects/24/10ee12b940bade9d9e99413732faa6dc60adb1 Normal file
View File

Binary file not shown.

BIN
test/integration/mergeConflictUndo/expected/.git_keep/objects/24/6f7487e08e6330ccbec4053e701145d53f64d4 Normal file
View File

Binary file not shown.

BIN
test/integration/mergeConflictUndo/expected/.git_keep/objects/27/94411aa7b73b44f533fb862cdb9dbfd13c5d92 Normal file
View File

Binary file not shown.

3
test/integration/mergeConflictUndo/expected/.git_keep/objects/28/9b2994fdad04740a383797513c39dd183c87d3 Normal file
View File

@ -0,0 +1,3 @@
x�ŽK
1D]ç½$�ÿ€ˆ0«9FÒÝ2‚q†ÁãðR»âÕ£h«õÞÁhèM8åH^3åâL1%ñ#1 I0ší\a§öÜäÙÁ'ô(#ÎGÔ‹g›xrèmÊF,YÖó¤ò»¯[ƒy�ó¼\å“ëþ�mõ0Zœ†
ŽˆZ«ÑŽS]þÄU_ï�á·‚[“ת¾¢O>�

BIN
test/integration/mergeConflictUndo/expected/.git_keep/objects/2c/2a4608db50f4c6df0e4580119fd2627d160acd Normal file
View File

Binary file not shown.

BIN
test/integration/mergeConflictUndo/expected/.git_keep/objects/2e/cced19ece4424e0d3f26eb3ea2ccb6bfeafaa8 Normal file
View File

Binary file not shown.

BIN
test/integration/mergeConflictUndo/expected/.git_keep/objects/32/d15fd4451b6693a93d6420c8af6cfc99348e71 Normal file
View File

Binary file not shown.

BIN
test/integration/mergeConflictUndo/expected/.git_keep/objects/34/c74161eef968fc951cf170a011fa8abfeddbcd Normal file
View File

Binary file not shown.

BIN
test/integration/mergeConflictUndo/expected/.git_keep/objects/36/d36a1d6a6e1fb7305747cf1cfedac0d3826e3e Normal file
View File

Binary file not shown.

BIN
test/integration/mergeConflictUndo/expected/.git_keep/objects/36/e0ef3e52c6e29e64980c71defbab6064d2da8c Normal file
View File

Binary file not shown.

2
test/integration/mergeConflictUndo/expected/.git_keep/objects/38/08a710b52a152bb73805fe274e0d877cf61800 Normal file
View File

@ -0,0 +1,2 @@
xå�A
Â0E]çÿAîTz�I34…˜)É´âíM‰K‘îý0 |>oñ\‡ãa¿ë83ÆBQÉ/h E Çœ }­²Ìa¨ŸAsjAw¿ÞŒ¤ž1O’*Bǯ³Š|V¡'5ç–ßC/ƒ¹´ÀóÂQ&c­ý«Û¬5Éêx³ÜÏü›â7Ã0|Æ

1
test/integration/mergeConflictUndo/expected/.git_keep/objects/4f/80ec0c7b09eeeb580d0c19947477c02bc88c25 Normal file
View File

@ -0,0 +1 @@
xå�Ñ €0CývŠLÐÅ\ãj�VО´WÄí=Àü�„äãùM<†iìf.Œµ‚PUÊM¤HTá™3T¶`Q‘–¢9ƒ"×^òÂh‡d[éºóÓØËi+B�Ø;ç~¥/ Y:/–¸<PÃ

BIN
test/integration/mergeConflictUndo/expected/.git_keep/objects/50/573100e1dd69a2a1434e9e63b424946679925e Normal file
View File

Binary file not shown.

BIN
test/integration/mergeConflictUndo/expected/.git_keep/objects/58/151e1e14571021b5d38d941538a2e3c3d0e7a9 Normal file
View File

Binary file not shown.

BIN
test/integration/mergeConflictUndo/expected/.git_keep/objects/5d/874a902548f753e50944827e572a7470aa9731 Normal file
View File

Binary file not shown.

BIN
test/integration/mergeConflictUndo/expected/.git_keep/objects/5d/a4d9200457542d875fe4def54ac98c16332db0 Normal file
View File

Binary file not shown.

2
test/integration/mergeConflictUndo/expected/.git_keep/objects/5e/9fe3aa0c84eab154f6f8796804b9e2e0ab0401 Normal file
View File

@ -0,0 +1,2 @@
x�ŽA
Â0E]ç³$Ó´M"BW=Æt2CcJLÁã[ðnÿñ—œ :´§VEÀõì{QDã”〬è-YD¥@‹JJ '³Q•Wƒ±óãèlÒÀŒ÷ÄIb'N)RÒè ím-¦®Ó|—åí).ùÇ�w‡€pF´ÖôˆjòçÜhÙk[á§AyA¦÷a›/¼ÔBC

BIN
test/integration/mergeConflictUndo/expected/.git_keep/objects/5f/3e4598b46a912f0f95a4898743e979343c82f3 Normal file
View File

Binary file not shown.

BIN
test/integration/mergeConflictUndo/expected/.git_keep/objects/60/91d709b275e712111d016d9b3a4fb44e63f1f6 Normal file
View File

Binary file not shown.

BIN
test/integration/mergeConflictUndo/expected/.git_keep/objects/61/01e935461d4cd862ae4a720846e87880d198b9 Normal file
View File

Binary file not shown.

2
test/integration/mergeConflictUndo/expected/.git_keep/objects/62/7a99630df8cc12c4acdebac3e3e8af1adf9711 Normal file
View File

@ -0,0 +1,2 @@
x��K
Β0@]η³$“οD„®z�i3΅cJ�ΰρ-x·�χΰΝ­ΦµƒΡιΤw0‰KτΪ&K!x"ΔθtH“Έμ¨°#+�‹Ϊx—g.fΞΖκBa�Xp�‘Ν„¶d�t&*h}τ’Ώϋ�vFΈγ]>\·‡\ζVo€£Εδ α�¨µ:θ1ΥεO]υeέ3ό*hO¨ό:bυΟ�?

BIN
test/integration/mergeConflictUndo/expected/.git_keep/objects/72/df4fceb0be99deb091ece3f501ef80b39a876a Normal file
View File

Binary file not shown.

BIN
test/integration/mergeConflictUndo/expected/.git_keep/objects/78/3666de4acbb22a9efc205197667f5136118c54 Normal file
View File

Binary file not shown.

BIN
test/integration/mergeConflictUndo/expected/.git_keep/objects/7d/80e0ed109e6802aa1f23a473200c9af3f8cf61 Normal file
View File

Binary file not shown.

3
test/integration/mergeConflictUndo/expected/.git_keep/objects/7f/983b882d71782f6520493b14e45b1eb3888a57 Normal file
View File

@ -0,0 +1,3 @@
x�ŽA
à »öî ůæk ”BV9†ù>I &!Xèñèºf`d«uiÚi à8tV¶û> ”Q¦4±aŸmNQÔž¬íô³ãD™ƒÊœé‚RH
r“]´ •ÞmÞ=Œú>ŒO|RÝ_¸ÉVš˜‚£¾‹¤¯Dƨ“žS êª,¥ÍúWéu¨/Ò�?

2
test/integration/mergeConflictUndo/expected/.git_keep/objects/7f/df0429a1e95f38736a260c5ed4121aa5d6e76f Normal file
View File

@ -0,0 +1,2 @@
x�ÎM
Â0@a×9Eö‚Ì´ù™¡«c’L°ÐØR"x|{·�oñòÖÚÒ-2^ú¡j Ÿ©e¯…=«+i�ÄTCHAJŒf—CßÝz媣dr* ½«¡Rä@àë   ‘Om‡�f{Ÿæ§~¥í«ÞòÖÆÙÚ+"€9ë9ÕõOn겪ùpÒ9Ÿ

3
test/integration/mergeConflictUndo/expected/.git_keep/objects/81/46e9924caf0aa2d21db44095ae5a0b0f6e1ce4 Normal file
View File

@ -0,0 +1,3 @@
x�ŽK
Â@D]Ï)z/Hz~Ý!«£'éacB!ÇwÀ ¸¬âÕ£¦uYlçOuW… ç}ôÅ‹£œ3…ÄÑ
![Fv)°Ùd×WÊ}ËÌv&$¶9†¦ê]B¯>$Ôä˜YùÔ²î0ŒpÆ»²lO½LërŒHûÀgÄ®3­m§ªþ‰›÷ã¨~+(RÄ|‰Ð<å

BIN
test/integration/mergeConflictUndo/expected/.git_keep/objects/88/9b0fdfe5f2ae3d7df3066f3bc1e181fa712c8d Normal file
View File

Binary file not shown.

BIN
test/integration/mergeConflictUndo/expected/.git_keep/objects/88/c39cdc29c995f8e1a63ccd48e7bbd6d96cb8b8 Normal file
View File

Binary file not shown.

BIN
test/integration/mergeConflictUndo/expected/.git_keep/objects/8b/7aa507318e42a4efdae2c867d89590bbce48e5 Normal file
View File

Binary file not shown.

BIN
test/integration/mergeConflictUndo/expected/.git_keep/objects/90/a84fd62f8033027fab3e567a81d5ed2a6a71cd Normal file
View File

Binary file not shown.

BIN
test/integration/mergeConflictUndo/expected/.git_keep/objects/91/65a12a95d3b2b9b8a0374de787af169b2c339e Normal file
View File

Binary file not shown.

BIN
test/integration/mergeConflictUndo/expected/.git_keep/objects/95/9d7a10da71acf97b17300b40a3b4f30903e09c Normal file
View File

Binary file not shown.

BIN
test/integration/mergeConflictUndo/expected/.git_keep/objects/9d/e8260b738a34a74533df54f2e404276aa96242 Normal file
View File

Binary file not shown.

BIN
test/integration/mergeConflictUndo/expected/.git_keep/objects/9e/0b31da5b56c4dd7230a85fee330246c16845ac Normal file
View File

Binary file not shown.

BIN
test/integration/mergeConflictUndo/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 Normal file
View File

Binary file not shown.

BIN
test/integration/mergeConflictUndo/expected/.git_keep/objects/ab/172f11e9d1ffc28e53b7c5504f173bf1b27527 Normal file
View File

Binary file not shown.

BIN
test/integration/mergeConflictUndo/expected/.git_keep/objects/af/2cd230f86b71f1b77a2b13fd090d88f13575e9 Normal file
View File

Binary file not shown.

BIN
test/integration/mergeConflictUndo/expected/.git_keep/objects/af/a76754c933269d7cd45630a7184a20849dbe9c Normal file
View File

Binary file not shown.

BIN
test/integration/mergeConflictUndo/expected/.git_keep/objects/b4/121e2d6aa156227b6541431ddfb8594904b520 Normal file
View File

Binary file not shown.

BIN
test/integration/mergeConflictUndo/expected/.git_keep/objects/c1/dd146476a4a37fff75b88612a718281ea83b58 Normal file
View File

Binary file not shown.

BIN
test/integration/mergeConflictUndo/expected/.git_keep/objects/c4/b40606be30048d61ed9bb55e21ecd612f34d7d Normal file
View File

Binary file not shown.

BIN
test/integration/mergeConflictUndo/expected/.git_keep/objects/ca/d08b7e2fbbabb2235cc4ca7785f8ba00247d50 Normal file
View File

Binary file not shown.

BIN
test/integration/mergeConflictUndo/expected/.git_keep/objects/d0/60f7226715ca55b04e91fad2b8aca01badd993 Normal file
View File

Binary file not shown.

BIN
test/integration/mergeConflictUndo/expected/.git_keep/objects/d8/a7c50dcab42b2b62e5c77cdcece620d3964bd4 Normal file
View File

Binary file not shown.

BIN
test/integration/mergeConflictUndo/expected/.git_keep/objects/da/72a6dd6fbaaa4a2803a3c867437ab81a1a99a0 Normal file
View File

Binary file not shown.

BIN
test/integration/mergeConflictUndo/expected/.git_keep/objects/db/35d1bf1bfbb57b4b345ee4f6f0554e9e72b015 Normal file
View File

Binary file not shown.

1
test/integration/mergeConflictUndo/expected/.git_keep/objects/dc/d348507ba1da8f6479b9d964daa302b2fb9d9c Normal file
View File

@ -0,0 +1 @@
xĺ�Ń €0Cýî™ ?Š3¸ĆµV¨=iOÄí=Ŕü�„äă…,ý8tWĆÚ@h*ő‚&R$jĚ*y¶¨Ę‘s-Üś”Č8v)¶Ňu㧱—ÓV„HęĽ÷żŇ�"ťË µćPż

BIN
test/integration/mergeConflictUndo/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b Normal file
View File

Binary file not shown.

BIN
test/integration/mergeConflictUndo/expected/.git_keep/objects/e3/ae5c6d8407e8307b9bc77923be78c901408f6e Normal file
View File

Binary file not shown.

BIN
test/integration/mergeConflictUndo/expected/.git_keep/objects/e4/48ae5bf6371d80ebee24a22b6df341797a6511 Normal file
View File

Binary file not shown.

BIN
test/integration/mergeConflictUndo/expected/.git_keep/objects/e4/666ba294866d5c16f9afebcacf8f4adfee7439 Normal file
View File

Binary file not shown.

2
test/integration/mergeConflictUndo/expected/.git_keep/objects/e5/03834faae098b6e456c2e2ab921737b3fd957c Normal file
View File

@ -0,0 +1,2 @@
x��K
Β0@]η³d&“_ADθ�Η�Ι ­)1�Η·ΰά>ήƒ—κΊΞ4α΅7ΠΖo‚ β�1¥›$ƒ–Ε#‘±Ωrq&µΕ&�>”L8� ¨c¤Ά9Ο1 ±p ©8RρΥοµΑ8Αy�®ς‰λ¶Θ)ΥυδΘ3 6‰ΥNχ©.κ�ΜνΩαWA}@–·,uS_6έ?Ώ

BIN
test/integration/mergeConflictUndo/expected/.git_keep/objects/ea/a48cb1e3d47e1b8b8df47bdc248e991207cc3d Normal file
View File

Binary file not shown.

BIN
test/integration/mergeConflictUndo/expected/.git_keep/objects/eb/90e8d7b137a1d89480c9b22fd03199da77c9c7 Normal file
View File

Binary file not shown.

BIN
test/integration/mergeConflictUndo/expected/.git_keep/objects/f1/46c7f7b874778c1ad0cf9aebe45ec2427c7de2 Normal file
View File

Binary file not shown.

BIN
test/integration/mergeConflictUndo/expected/.git_keep/objects/f3/f762af4429ae89fa0dae3d0a5b500ca11630c4 Normal file
View File

Binary file not shown.

BIN
test/integration/mergeConflictUndo/expected/.git_keep/objects/fd/31cea7e0b6e8d334280be34db8dd86cdda3007 Normal file
View File

Binary file not shown.

1
test/integration/mergeConflictUndo/expected/.git_keep/refs/heads/base_branch Normal file
View File

@ -0,0 +1 @@
c4b40606be30048d61ed9bb55e21ecd612f34d7d

1
test/integration/mergeConflictUndo/expected/.git_keep/refs/heads/develop Normal file
View File

@ -0,0 +1 @@
8b7aa507318e42a4efdae2c867d89590bbce48e5

1
test/integration/mergeConflictUndo/expected/.git_keep/refs/heads/feature/cherry-picking Normal file
View File

@ -0,0 +1 @@
7d80e0ed109e6802aa1f23a473200c9af3f8cf61

1
test/integration/mergeConflictUndo/expected/.git_keep/refs/heads/master Normal file
View File

@ -0,0 +1 @@
5e9fe3aa0c84eab154f6f8796804b9e2e0ab0401

1
test/integration/mergeConflictUndo/expected/.git_keep/refs/heads/other_branch Normal file
View File

@ -0,0 +1 @@
0a71a0176c3eb0a7ccba7e8e675743aecb362f3a

1
test/integration/mergeConflictUndo/expected/cherrypicking1 Normal file
View File

@ -0,0 +1 @@
this is file number 1 that I'm going to cherry-pick

1
test/integration/mergeConflictUndo/expected/cherrypicking2 Normal file
View File

@ -0,0 +1 @@
this is file number 2 that I'm going to cherry-pick

1
test/integration/mergeConflictUndo/expected/cherrypicking3 Normal file
View File

@ -0,0 +1 @@
this is file number 3 that I'm going to cherry-pick

1
test/integration/mergeConflictUndo/expected/cherrypicking4 Normal file
View File

@ -0,0 +1 @@
this is file number 4 that I'm going to cherry-pick

1
test/integration/mergeConflictUndo/expected/cherrypicking5 Normal file
View File

@ -0,0 +1 @@
this is file number 5 that I'm going to cherry-pick

1
test/integration/mergeConflictUndo/expected/cherrypicking6 Normal file
View File

@ -0,0 +1 @@
this is file number 6 that I'm going to cherry-pick

1
test/integration/mergeConflictUndo/expected/cherrypicking7 Normal file
View File

@ -0,0 +1 @@
this is file number 7 that I'm going to cherry-pick

1
test/integration/mergeConflictUndo/expected/cherrypicking8 Normal file
View File

@ -0,0 +1 @@
this is file number 8 that I'm going to cherry-pick

1
test/integration/mergeConflictUndo/expected/cherrypicking9 Normal file
View File

@ -0,0 +1 @@
this is file number 9 that I'm going to cherry-pick

1
test/integration/mergeConflictUndo/expected/directory/file Normal file
View File

@ -0,0 +1 @@
test2

1
test/integration/mergeConflictUndo/expected/directory/file2 Normal file
View File

@ -0,0 +1 @@
test3

Some files were not shown because too many files have changed in this diff Show More