mirror of
https://github.com/jesseduffield/lazygit.git
synced 2025-10-08 22:52:12 +02:00
add merge conflict undo integration test
This commit is contained in:
Jesse Duffield
@@ -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,0 +1 @@
|
||||
ref: refs/heads/other_branch
|
||||
@@ -0,0 +1 @@
|
||||
ab172f11e9d1ffc28e53b7c5504f173bf1b27527
|
||||
10
test/integration/mergeConflictUndo/expected/.git_keep/config
Normal file
10
test/integration/mergeConflictUndo/expected/.git_keep/config
Normal 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
|
||||
@@ -0,0 +1 @@
|
||||
Unnamed repository; edit this file 'description' to name the repository.
|
||||
BIN
test/integration/mergeConflictUndo/expected/.git_keep/index
Normal file
BIN
test/integration/mergeConflictUndo/expected/.git_keep/index
Normal file
Binary file not shown.
@@ -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
|
||||
@@ -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
|
||||
@@ -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
|
||||
@@ -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
|
||||
@@ -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
|
||||
@@ -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
|
||||
@@ -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
|
||||
@@ -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�@
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -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�
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -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>�
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -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|�
|
||||
@@ -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�
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -0,0 +1,2 @@
|
||||
x��A
|
||||
�0E]��$ӴM"BW=�t2CcJL��[�n �� ��
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -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�Ϫ?
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -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
|
||||
@@ -0,0 +1,2 @@
|
||||
x��M
|
||||
�0@a�9E��̴���� c�L���R"x|{��o�����-2^��j ��e��=�+i��TCH AJ�f�C��z媣dr* ���R�@��� ��Om��f{���~������ ���+"�9�9��On겪�p�9�
|
||||
@@ -0,0 +1,3 @@
|
||||
x��K
|
||||
�@D]�)z/Hz~�!� �'�acB !�w� ���գ�uY l�OuW� �}�ŋ��3�� �
|
||||
![Fv)��d�W�}��v&$�9���]B�>$���Y�Բ�0�p ƻ �lO�L�r�H��gĮ3�m��������~+(R�|��<�
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -0,0 +1 @@
|
||||
x��� �0C����?�3�Ƶ V�=iO��= �������,�8tW��@h*��&R$j�*y��ʑs-ܜ��8v)��u㧱��V�H������"��
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -0,0 +1,2 @@
|
||||
x��K
|
||||
�0@]��d&�_AD��Lj� �)1�Ƿ��>ރ���� 4��7��o� ��1��$���#���rq&��&�>�L8� �c��9�1
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -0,0 +1 @@
|
||||
c4b40606be30048d61ed9bb55e21ecd612f34d7d
|
||||
@@ -0,0 +1 @@
|
||||
8b7aa507318e42a4efdae2c867d89590bbce48e5
|
||||
@@ -0,0 +1 @@
|
||||
7d80e0ed109e6802aa1f23a473200c9af3f8cf61
|
||||
@@ -0,0 +1 @@
|
||||
5e9fe3aa0c84eab154f6f8796804b9e2e0ab0401
|
||||
@@ -0,0 +1 @@
|
||||
0a71a0176c3eb0a7ccba7e8e675743aecb362f3a
|
||||
@@ -0,0 +1 @@
|
||||
this is file number 1 that I'm going to cherry-pick
|
||||
@@ -0,0 +1 @@
|
||||
this is file number 2 that I'm going to cherry-pick
|
||||
@@ -0,0 +1 @@
|
||||
this is file number 3 that I'm going to cherry-pick
|
||||
@@ -0,0 +1 @@
|
||||
this is file number 4 that I'm going to cherry-pick
|
||||
@@ -0,0 +1 @@
|
||||
this is file number 5 that I'm going to cherry-pick
|
||||
@@ -0,0 +1 @@
|
||||
this is file number 6 that I'm going to cherry-pick
|
||||
@@ -0,0 +1 @@
|
||||
this is file number 7 that I'm going to cherry-pick
|
||||
@@ -0,0 +1 @@
|
||||
this is file number 8 that I'm going to cherry-pick
|
||||
@@ -0,0 +1 @@
|
||||
this is file number 9 that I'm going to cherry-pick
|
||||
@@ -0,0 +1 @@
|
||||
test2
|
||||
@@ -0,0 +1 @@
|
||||
test3
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user