go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-03-21 21:47:32 +02:00
Code Issues Releases Activity

update merge conflict undo test

Browse Source
This commit is contained in:
Jesse Duffield 2021-04-05 11:16:11 +10:00
parent dfc689411b
commit 3c20425649
66 changed files with 124 additions and 123 deletions
test/integration/mergeConflictUndo
expected
.git_keep
COMMIT_EDITMSGMERGE_HEADMERGE_MODEMERGE_MSGORIG_HEADindex
logs
HEAD
refs/heads
base_branchdevelop
feature
cherry-picking
masterother_branch
objects
01
0057d2acf80e41ed5e6a8e49cb2c8329ae843b
05
a37c1f6dc7942f15f80d45254d38735918f670
06
fe8615a7ea8f1eea8955bd8039c9c6bcd7ed23
08
4111cdf3945cf795dfa651723e7e6a927e48ef
0a
71a0176c3eb0a7ccba7e8e675743aecb362f3a
1e
953a069f4b657c300ea0464ecc13f9c2e34905
28
9b2994fdad04740a383797513c39dd183c87d3
2c
2a4608db50f4c6df0e4580119fd2627d160acd
2f
15f547118f3c3d9c81175825923e13ec6f0aa0
36
d36a1d6a6e1fb7305747cf1cfedac0d3826e3e
39
b895b8f8b050030fe6aaf6404c660f22b939e7
50
573100e1dd69a2a1434e9e63b424946679925e
54
b6871251edf1636a77993925843c6294daa768
58
151e1e14571021b5d38d941538a2e3c3d0e7a9
5e
9fe3aa0c84eab154f6f8796804b9e2e0ab0401
61
f5538c896ea41a0303368b24ab8e5dd6b0fba3
62
7a99630df8cc12c4acdebac3e3e8af1adf9711
72
df4fceb0be99deb091ece3f501ef80b39a876a
7d
80e0ed109e6802aa1f23a473200c9af3f8cf61
7f
983b882d71782f6520493b14e45b1eb3888a57df0429a1e95f38736a260c5ed4121aa5d6e76f
81
46e9924caf0aa2d21db44095ae5a0b0f6e1ce4
8b
7aa507318e42a4efdae2c867d89590bbce48e5
8c
eeb6cc4581b42aa9deaf9710223615ee17bef2
8f
9f24614460289546a49cb6f12a72b764af14f5
97
769241761ba59cd64059d15b548e65e8d3e65f
9c
09cc9177a699a0a920d8c2a84cd2de68295382
9e
0b31da5b56c4dd7230a85fee330246c16845ac
9f
4efa2b7bc217363a1b3bc4a9a9fc419118f907
ab
172f11e9d1ffc28e53b7c5504f173bf1b2752779b4d60771766afa792d180d79f39d60739285
ae
adfe82e7a5b499b5f4e5f5ebdc8673abf4c681
af
2cd230f86b71f1b77a2b13fd090d88f13575e9
b3
be4ef2bb9bc0b38e4f57c4853878b66299bdb4
bb
921216baab8956cd3e4bdacd80eaefae7eb8e6
bc
074264114488d21413b64eb72fdfaac5a79427
c4
b40606be30048d61ed9bb55e21ecd612f34d7d
c6
22516f02266679505b89103007ec04b8748b67
ca
d08b7e2fbbabb2235cc4ca7785f8ba00247d50
db
35d1bf1bfbb57b4b345ee4f6f0554e9e72b015
e3
a8db29b20f1aa519419cf02d0ce0a313a26270
e5
03834faae098b6e456c2e2ab921737b3fd957c
ea
69b78c08d9698cadc90164ddd19aca6ae05d5f
refs/heads
base_branchdevelop
feature
cherry-picking
masterother_branch
directory
filefile2
file3file4file5
recording.json

36
test/integration/mergeConflictUndo/expected/.git_keep/COMMIT_EDITMSG

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

1
test/integration/mergeConflictUndo/expected/.git_keep/MERGE_HEAD Normal file

@ -0,0 +1 @@
8f9f24614460289546a49cb6f12a72b764af14f5

0
test/integration/mergeConflictUndo/expected/.git_keep/MERGE_MODE Normal file

9
test/integration/mergeConflictUndo/expected/.git_keep/MERGE_MSG Normal file

@ -0,0 +1,9 @@
Merge branch 'develop' into other_branch
# Conflicts:
# directory/file
# directory/file2
# file1
# file3
# file4
# file5

2
test/integration/mergeConflictUndo/expected/.git_keep/ORIG_HEAD

@ -1 +1 @@
ab172f11e9d1ffc28e53b7c5504f173bf1b27527
c622516f02266679505b89103007ec04b8748b67

BIN
test/integration/mergeConflictUndo/expected/.git_keep/index

Binary file not shown.

67
test/integration/mergeConflictUndo/expected/.git_keep/logs/HEAD

@ -1,34 +1,33 @@
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
0000000000000000000000000000000000000000 bb921216baab8956cd3e4bdacd80eaefae7eb8e6 CI <CI@example.com> 1617585236 +1000 commit (initial): first commit
bb921216baab8956cd3e4bdacd80eaefae7eb8e6 bb921216baab8956cd3e4bdacd80eaefae7eb8e6 CI <CI@example.com> 1617585236 +1000 checkout: moving from master to feature/cherry-picking
bb921216baab8956cd3e4bdacd80eaefae7eb8e6 bc074264114488d21413b64eb72fdfaac5a79427 CI <CI@example.com> 1617585236 +1000 commit: first commit freshman year
bc074264114488d21413b64eb72fdfaac5a79427 39b895b8f8b050030fe6aaf6404c660f22b939e7 CI <CI@example.com> 1617585236 +1000 commit: second commit subway eat fresh
39b895b8f8b050030fe6aaf6404c660f22b939e7 e3a8db29b20f1aa519419cf02d0ce0a313a26270 CI <CI@example.com> 1617585236 +1000 commit: third commit fresh
e3a8db29b20f1aa519419cf02d0ce0a313a26270 61f5538c896ea41a0303368b24ab8e5dd6b0fba3 CI <CI@example.com> 1617585236 +1000 commit: fourth commit cool
61f5538c896ea41a0303368b24ab8e5dd6b0fba3 06fe8615a7ea8f1eea8955bd8039c9c6bcd7ed23 CI <CI@example.com> 1617585236 +1000 commit: fifth commit nice
06fe8615a7ea8f1eea8955bd8039c9c6bcd7ed23 2f15f547118f3c3d9c81175825923e13ec6f0aa0 CI <CI@example.com> 1617585236 +1000 commit: sixth commit haha
2f15f547118f3c3d9c81175825923e13ec6f0aa0 97769241761ba59cd64059d15b548e65e8d3e65f CI <CI@example.com> 1617585236 +1000 commit: seventh commit yeah
97769241761ba59cd64059d15b548e65e8d3e65f 05a37c1f6dc7942f15f80d45254d38735918f670 CI <CI@example.com> 1617585236 +1000 commit: eighth commit woo
05a37c1f6dc7942f15f80d45254d38735918f670 05a37c1f6dc7942f15f80d45254d38735918f670 CI <CI@example.com> 1617585236 +1000 checkout: moving from feature/cherry-picking to develop
05a37c1f6dc7942f15f80d45254d38735918f670 b3be4ef2bb9bc0b38e4f57c4853878b66299bdb4 CI <CI@example.com> 1617585236 +1000 commit: first commit on develop
b3be4ef2bb9bc0b38e4f57c4853878b66299bdb4 bb921216baab8956cd3e4bdacd80eaefae7eb8e6 CI <CI@example.com> 1617585236 +1000 checkout: moving from develop to master
bb921216baab8956cd3e4bdacd80eaefae7eb8e6 ab79b4d60771766afa792d180d79f39d60739285 CI <CI@example.com> 1617585236 +1000 commit: first commit on master
ab79b4d60771766afa792d180d79f39d60739285 b3be4ef2bb9bc0b38e4f57c4853878b66299bdb4 CI <CI@example.com> 1617585236 +1000 checkout: moving from master to develop
b3be4ef2bb9bc0b38e4f57c4853878b66299bdb4 54b6871251edf1636a77993925843c6294daa768 CI <CI@example.com> 1617585236 +1000 commit: second commit on develop
54b6871251edf1636a77993925843c6294daa768 ab79b4d60771766afa792d180d79f39d60739285 CI <CI@example.com> 1617585236 +1000 checkout: moving from develop to master
ab79b4d60771766afa792d180d79f39d60739285 ea69b78c08d9698cadc90164ddd19aca6ae05d5f CI <CI@example.com> 1617585236 +1000 commit: second commit on master
ea69b78c08d9698cadc90164ddd19aca6ae05d5f 54b6871251edf1636a77993925843c6294daa768 CI <CI@example.com> 1617585236 +1000 checkout: moving from master to develop
54b6871251edf1636a77993925843c6294daa768 aeadfe82e7a5b499b5f4e5f5ebdc8673abf4c681 CI <CI@example.com> 1617585236 +1000 commit: third commit on develop
aeadfe82e7a5b499b5f4e5f5ebdc8673abf4c681 ea69b78c08d9698cadc90164ddd19aca6ae05d5f CI <CI@example.com> 1617585236 +1000 checkout: moving from develop to master
ea69b78c08d9698cadc90164ddd19aca6ae05d5f 8ceeb6cc4581b42aa9deaf9710223615ee17bef2 CI <CI@example.com> 1617585236 +1000 commit: third commit on master
8ceeb6cc4581b42aa9deaf9710223615ee17bef2 aeadfe82e7a5b499b5f4e5f5ebdc8673abf4c681 CI <CI@example.com> 1617585236 +1000 checkout: moving from master to develop
aeadfe82e7a5b499b5f4e5f5ebdc8673abf4c681 8f9f24614460289546a49cb6f12a72b764af14f5 CI <CI@example.com> 1617585236 +1000 commit: fourth commit on develop
8f9f24614460289546a49cb6f12a72b764af14f5 8ceeb6cc4581b42aa9deaf9710223615ee17bef2 CI <CI@example.com> 1617585236 +1000 checkout: moving from develop to master
8ceeb6cc4581b42aa9deaf9710223615ee17bef2 9c09cc9177a699a0a920d8c2a84cd2de68295382 CI <CI@example.com> 1617585236 +1000 commit: fourth commit on master
9c09cc9177a699a0a920d8c2a84cd2de68295382 9c09cc9177a699a0a920d8c2a84cd2de68295382 CI <CI@example.com> 1617585236 +1000 checkout: moving from master to base_branch
9c09cc9177a699a0a920d8c2a84cd2de68295382 9f4efa2b7bc217363a1b3bc4a9a9fc419118f907 CI <CI@example.com> 1617585236 +1000 commit: file
9f4efa2b7bc217363a1b3bc4a9a9fc419118f907 9f4efa2b7bc217363a1b3bc4a9a9fc419118f907 CI <CI@example.com> 1617585236 +1000 checkout: moving from base_branch to other_branch
9f4efa2b7bc217363a1b3bc4a9a9fc419118f907 9f4efa2b7bc217363a1b3bc4a9a9fc419118f907 CI <CI@example.com> 1617585236 +1000 checkout: moving from other_branch to base_branch
9f4efa2b7bc217363a1b3bc4a9a9fc419118f907 010057d2acf80e41ed5e6a8e49cb2c8329ae843b CI <CI@example.com> 1617585236 +1000 commit: file changed
010057d2acf80e41ed5e6a8e49cb2c8329ae843b 9f4efa2b7bc217363a1b3bc4a9a9fc419118f907 CI <CI@example.com> 1617585236 +1000 checkout: moving from base_branch to other_branch
9f4efa2b7bc217363a1b3bc4a9a9fc419118f907 c622516f02266679505b89103007ec04b8748b67 CI <CI@example.com> 1617585237 +1000 commit: asd

6
test/integration/mergeConflictUndo/expected/.git_keep/logs/refs/heads/base_branch

@ -1,3 +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
0000000000000000000000000000000000000000 9c09cc9177a699a0a920d8c2a84cd2de68295382 CI <CI@example.com> 1617585236 +1000 branch: Created from HEAD
9c09cc9177a699a0a920d8c2a84cd2de68295382 9f4efa2b7bc217363a1b3bc4a9a9fc419118f907 CI <CI@example.com> 1617585236 +1000 commit: file
9f4efa2b7bc217363a1b3bc4a9a9fc419118f907 010057d2acf80e41ed5e6a8e49cb2c8329ae843b CI <CI@example.com> 1617585236 +1000 commit: file changed

10
test/integration/mergeConflictUndo/expected/.git_keep/logs/refs/heads/develop

@ -1,5 +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
0000000000000000000000000000000000000000 05a37c1f6dc7942f15f80d45254d38735918f670 CI <CI@example.com> 1617585236 +1000 branch: Created from HEAD
05a37c1f6dc7942f15f80d45254d38735918f670 b3be4ef2bb9bc0b38e4f57c4853878b66299bdb4 CI <CI@example.com> 1617585236 +1000 commit: first commit on develop
b3be4ef2bb9bc0b38e4f57c4853878b66299bdb4 54b6871251edf1636a77993925843c6294daa768 CI <CI@example.com> 1617585236 +1000 commit: second commit on develop
54b6871251edf1636a77993925843c6294daa768 aeadfe82e7a5b499b5f4e5f5ebdc8673abf4c681 CI <CI@example.com> 1617585236 +1000 commit: third commit on develop
aeadfe82e7a5b499b5f4e5f5ebdc8673abf4c681 8f9f24614460289546a49cb6f12a72b764af14f5 CI <CI@example.com> 1617585236 +1000 commit: fourth commit on develop

18
test/integration/mergeConflictUndo/expected/.git_keep/logs/refs/heads/feature/cherry-picking

@ -1,9 +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
0000000000000000000000000000000000000000 bb921216baab8956cd3e4bdacd80eaefae7eb8e6 CI <CI@example.com> 1617585236 +1000 branch: Created from HEAD
bb921216baab8956cd3e4bdacd80eaefae7eb8e6 bc074264114488d21413b64eb72fdfaac5a79427 CI <CI@example.com> 1617585236 +1000 commit: first commit freshman year
bc074264114488d21413b64eb72fdfaac5a79427 39b895b8f8b050030fe6aaf6404c660f22b939e7 CI <CI@example.com> 1617585236 +1000 commit: second commit subway eat fresh
39b895b8f8b050030fe6aaf6404c660f22b939e7 e3a8db29b20f1aa519419cf02d0ce0a313a26270 CI <CI@example.com> 1617585236 +1000 commit: third commit fresh
e3a8db29b20f1aa519419cf02d0ce0a313a26270 61f5538c896ea41a0303368b24ab8e5dd6b0fba3 CI <CI@example.com> 1617585236 +1000 commit: fourth commit cool
61f5538c896ea41a0303368b24ab8e5dd6b0fba3 06fe8615a7ea8f1eea8955bd8039c9c6bcd7ed23 CI <CI@example.com> 1617585236 +1000 commit: fifth commit nice
06fe8615a7ea8f1eea8955bd8039c9c6bcd7ed23 2f15f547118f3c3d9c81175825923e13ec6f0aa0 CI <CI@example.com> 1617585236 +1000 commit: sixth commit haha
2f15f547118f3c3d9c81175825923e13ec6f0aa0 97769241761ba59cd64059d15b548e65e8d3e65f CI <CI@example.com> 1617585236 +1000 commit: seventh commit yeah
97769241761ba59cd64059d15b548e65e8d3e65f 05a37c1f6dc7942f15f80d45254d38735918f670 CI <CI@example.com> 1617585236 +1000 commit: eighth commit woo

10
test/integration/mergeConflictUndo/expected/.git_keep/logs/refs/heads/master

@ -1,5 +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
0000000000000000000000000000000000000000 bb921216baab8956cd3e4bdacd80eaefae7eb8e6 CI <CI@example.com> 1617585236 +1000 commit (initial): first commit
bb921216baab8956cd3e4bdacd80eaefae7eb8e6 ab79b4d60771766afa792d180d79f39d60739285 CI <CI@example.com> 1617585236 +1000 commit: first commit on master
ab79b4d60771766afa792d180d79f39d60739285 ea69b78c08d9698cadc90164ddd19aca6ae05d5f CI <CI@example.com> 1617585236 +1000 commit: second commit on master
ea69b78c08d9698cadc90164ddd19aca6ae05d5f 8ceeb6cc4581b42aa9deaf9710223615ee17bef2 CI <CI@example.com> 1617585236 +1000 commit: third commit on master
8ceeb6cc4581b42aa9deaf9710223615ee17bef2 9c09cc9177a699a0a920d8c2a84cd2de68295382 CI <CI@example.com> 1617585236 +1000 commit: fourth commit on master

5
test/integration/mergeConflictUndo/expected/.git_keep/logs/refs/heads/other_branch

@ -1,3 +1,2 @@
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
0000000000000000000000000000000000000000 9f4efa2b7bc217363a1b3bc4a9a9fc419118f907 CI <CI@example.com> 1617585236 +1000 branch: Created from HEAD
9f4efa2b7bc217363a1b3bc4a9a9fc419118f907 c622516f02266679505b89103007ec04b8748b67 CI <CI@example.com> 1617585237 +1000 commit: asd

BIN
test/integration/mergeConflictUndo/expected/.git_keep/objects/01/0057d2acf80e41ed5e6a8e49cb2c8329ae843b Normal file

Binary file not shown.

2
test/integration/mergeConflictUndo/expected/.git_keep/objects/05/a37c1f6dc7942f15f80d45254d38735918f670 Normal file

@ -0,0 +1,2 @@
x�ŽM
Â0F]ç³$“d& ˆ]õù™ZÁšR"z| ^ÀÕ�÷à+mYîŒv‡¾‰€–™«¸Tr6&E™ŠÑ„Ñ3û‰Ð2b(äÔš6yvˆÞs4=cNKe§)V¤L.“„j÷™Tzõ¹m0ŒpÆ«|Ò²>äTÚrdôÈX†#j­ÕN÷S]þÔ•ÜosŸá—Á»5õ|Î<÷

2
test/integration/mergeConflictUndo/expected/.git_keep/objects/06/fe8615a7ea8f1eea8955bd8039c9c6bcd7ed23 Normal file

@ -0,0 +1,2 @@
x�ŽK
Â0@]ç³d’I¦)ˆ]õ“dB öC‰àñ-x·�÷àåmYæý¥ª@¬¨•4¸ÌêzeßGÌ�-Z“$FöʼnÙìrèÚ€m �bŽ=«x+HHÄ19/)j(…ž%y·i;`á>ŒOýȲ¿ô–·å–mbpÄpµˆhNzN5ýS7u®m‚_ëœÕ|€Ä>Š

3
test/integration/mergeConflictUndo/expected/.git_keep/objects/08/4111cdf3945cf795dfa651723e7e6a927e48ef

@ -1,3 +0,0 @@
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/0a/71a0176c3eb0a7ccba7e8e675743aecb362f3a

Binary file not shown.

2
test/integration/mergeConflictUndo/expected/.git_keep/objects/1e/953a069f4b657c300ea0464ecc13f9c2e34905

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

3
test/integration/mergeConflictUndo/expected/.git_keep/objects/28/9b2994fdad04740a383797513c39dd183c87d3

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

Binary file not shown.

2
test/integration/mergeConflictUndo/expected/.git_keep/objects/2f/15f547118f3c3d9c81175825923e13ec6f0aa0 Normal file

@ -0,0 +1,2 @@
x�ŽK
1D]ç½$�ÿ€ˆ0«9F'éÁ8ÃaŽoÀ ¸©E½WPimíÑAIsê;3$Ì�3Þ‘!íK)ÞÆ*òT@¦ £ b£�_¤+<¨%?@A9Ys�zJSr1eÏYiAŸ^×æ®órçƒÚöäKZÛ Ð¡·Á*íàŒRJ1ÚqªóŸºx?Ž^á·‚J•ÄJQ>`

BIN
test/integration/mergeConflictUndo/expected/.git_keep/objects/36/d36a1d6a6e1fb7305747cf1cfedac0d3826e3e

Binary file not shown.

BIN
test/integration/mergeConflictUndo/expected/.git_keep/objects/39/b895b8f8b050030fe6aaf6404c660f22b939e7 Normal file

Binary file not shown.

BIN
test/integration/mergeConflictUndo/expected/.git_keep/objects/50/573100e1dd69a2a1434e9e63b424946679925e

Binary file not shown.

BIN
test/integration/mergeConflictUndo/expected/.git_keep/objects/54/b6871251edf1636a77993925843c6294daa768 Normal file

Binary file not shown.

BIN
test/integration/mergeConflictUndo/expected/.git_keep/objects/58/151e1e14571021b5d38d941538a2e3c3d0e7a9

Binary file not shown.

2
test/integration/mergeConflictUndo/expected/.git_keep/objects/5e/9fe3aa0c84eab154f6f8796804b9e2e0ab0401

@ -1,2 +0,0 @@
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/61/f5538c896ea41a0303368b24ab8e5dd6b0fba3 Normal file

Binary file not shown.

2
test/integration/mergeConflictUndo/expected/.git_keep/objects/62/7a99630df8cc12c4acdebac3e3e8af1adf9711

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

Binary file not shown.

BIN
test/integration/mergeConflictUndo/expected/.git_keep/objects/7d/80e0ed109e6802aa1f23a473200c9af3f8cf61

Binary file not shown.

3
test/integration/mergeConflictUndo/expected/.git_keep/objects/7f/983b882d71782f6520493b14e45b1eb3888a57

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

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

@ -1,3 +0,0 @@
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/8b/7aa507318e42a4efdae2c867d89590bbce48e5

Binary file not shown.

3
test/integration/mergeConflictUndo/expected/.git_keep/objects/8c/eeb6cc4581b42aa9deaf9710223615ee17bef2 Normal file

@ -0,0 +1,3 @@
x█▌M
б0F]ГЁdрФg"BW=ф≤Liа4%FПЬ╪─шО╫_,9o  ╖VE`п·xЯг0▓s√Hkoп┘┤≤dhaCё^таUЖбy┼H)╦@▒S ╗²I)Ию▒ зdеО╤√
с вi╬к┤СЯ■K,Ызioиё┐ЁFDув~╙и÷╨jКVЭ*(;d~УX}1╦?Н

2
test/integration/mergeConflictUndo/expected/.git_keep/objects/8f/9f24614460289546a49cb6f12a72b764af14f5 Normal file

@ -0,0 +1,2 @@
x�ŽA
ƒ0»Î)þ¾Pü11J)¸ò?É ÔˆÄÒãWèºf`bY–W%Í|©;@1>F›Œ|ÊÆ…µñè{Ö�‹±Mj“k%�¤ ¯áÄÓ÷Áf›-ÎÂw®•�Mì<+9êTvFºãY¶·X–qÇÎz«ÛŽ®Ü4�:é9Uñ§®r9ö:Ñ/£²RÂsÙÔ31BÇ

BIN
test/integration/mergeConflictUndo/expected/.git_keep/objects/97/769241761ba59cd64059d15b548e65e8d3e65f Normal file

Binary file not shown.

3
test/integration/mergeConflictUndo/expected/.git_keep/objects/9c/09cc9177a699a0a920d8c2a84cd2de68295382 Normal file

@ -0,0 +1,3 @@
x�ŽM
Â0F]ç³$“6?¡«c2™PÁ˜RSðø¼€Û�÷x×R êSÛE`Ù�èP$O.dž,rF¯I#f
³¤9©�vy5,óhÆÑMI(Oµ1ƒC+‚>J6ŠŽ¶Öæ®ór—•í)®å=çm°�‡3j­U_û©&â*×co+ü4¨/(ôî¶ú–fAå

BIN
test/integration/mergeConflictUndo/expected/.git_keep/objects/9e/0b31da5b56c4dd7230a85fee330246c16845ac

Binary file not shown.

BIN
test/integration/mergeConflictUndo/expected/.git_keep/objects/9f/4efa2b7bc217363a1b3bc4a9a9fc419118f907 Normal file

Binary file not shown.

BIN
test/integration/mergeConflictUndo/expected/.git_keep/objects/ab/172f11e9d1ffc28e53b7c5504f173bf1b27527

Binary file not shown.

5
test/integration/mergeConflictUndo/expected/.git_keep/objects/ab/79b4d60771766afa792d180d79f39d60739285 Normal file

@ -0,0 +1,5 @@
x�ЮM
Т0�aз9ХьЩ3 "tеcLв �)i�oР И§xјR-eы %�zc� [�!ZOЈt�й�aВ�qBcM
:БSуW�Q+­|$��Oы№qЅДЩФ�xти zїGm0/p��;ЈьOОЄZn М�\pкx8+)Ѕы8ељЯ\ф­~
ъ
�/Ѓў@И

3
test/integration/mergeConflictUndo/expected/.git_keep/objects/ae/adfe82e7a5b499b5f4e5f5ebdc8673abf4c681 Normal file

@ -0,0 +1,3 @@
x�ŽK
Â@ @]Ï)²$™_ºòéLŠ‚uJÅã+x·�÷à•¶,·žp×73�$••°*“–Yx"ˆSD Sœ
C)nÕÍRœòÀäY�)‡¬Ì"A|b(ÙK¬ªœ§Ï~mŒ8Ž—³½uYïv(m9eâ4$2ì Ý—~§ºý©»~½m~´T{Ù½­îíÏ?

BIN
test/integration/mergeConflictUndo/expected/.git_keep/objects/af/2cd230f86b71f1b77a2b13fd090d88f13575e9

Binary file not shown.

BIN
test/integration/mergeConflictUndo/expected/.git_keep/objects/b3/be4ef2bb9bc0b38e4f57c4853878b66299bdb4 Normal file

Binary file not shown.

BIN
test/integration/mergeConflictUndo/expected/.git_keep/objects/bb/921216baab8956cd3e4bdacd80eaefae7eb8e6 Normal file

Binary file not shown.

3
test/integration/mergeConflictUndo/expected/.git_keep/objects/bc/074264114488d21413b64eb72fdfaac5a79427 Normal file

@ -0,0 +1,3 @@
x��K
1]ח½$�™˜aVs�מ־
ֶ‘Ao¯א�UP÷ײzיה]״פ�‡*²› ?ְזP|„°W•(\˜“¹sֳ­“ָה�wQ˜%Mcװ0Hfֹֽ‚Q{HB4�לחµׁ¼׀a^Nxq½_±׃µֹE·׃טC₪­³ײ�/‎Nu�©›ri�N¿�Jֳד\שFop3‰ֹDט

BIN
test/integration/mergeConflictUndo/expected/.git_keep/objects/c4/b40606be30048d61ed9bb55e21ecd612f34d7d

Binary file not shown.

BIN
test/integration/mergeConflictUndo/expected/.git_keep/objects/c6/22516f02266679505b89103007ec04b8748b67 Normal file

Binary file not shown.

BIN
test/integration/mergeConflictUndo/expected/.git_keep/objects/ca/d08b7e2fbbabb2235cc4ca7785f8ba00247d50

Binary file not shown.

BIN
test/integration/mergeConflictUndo/expected/.git_keep/objects/db/35d1bf1bfbb57b4b345ee4f6f0554e9e72b015

Binary file not shown.

2
test/integration/mergeConflictUndo/expected/.git_keep/objects/e3/a8db29b20f1aa519419cf02d0ce0a313a26270 Normal file

@ -0,0 +1,2 @@
x��K
Β0@]η³d�Ο$΅«#™LhΑΪ#x| ^ΐνγ=xΌ­λ�A£;υ&%$Ο §luΦ™΄8φ� i,&’ΝΕ�=5yv01‡θr¨!£C4X…R�dΡ2V­s4QΌJο>o Ζ ®γt—OZχ‡\x[o0Πΰ]pΪ�DT=¦Ίό©«>/­ΐ―‚Ϊδ5«/ηΎ?

2
test/integration/mergeConflictUndo/expected/.git_keep/objects/e5/03834faae098b6e456c2e2ab921737b3fd957c

@ -1,2 +0,0 @@
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έ?Ώ

2
test/integration/mergeConflictUndo/expected/.git_keep/objects/ea/69b78c08d9698cadc90164ddd19aca6ae05d5f Normal file

@ -0,0 +1,2 @@
x�ŽM
Â0…]ç³d’´3 ˆ]yŒÉOQ0Mi#x|#^Àåûù/ÖR ŒÆCÛrô1d‰5G$!혴 ]š0Û8º1©U¶¼4�À> ‰�;A$³°7I;Lìgë¿�õÆ�J^í^7˜npžn×ü–²>ó)ÖrMšû¦±G�ˆª»ýTËÖÕžc]ü0¨ Ù;­>;´?ƒ

2
test/integration/mergeConflictUndo/expected/.git_keep/refs/heads/base_branch

@ -1 +1 @@
c4b40606be30048d61ed9bb55e21ecd612f34d7d
010057d2acf80e41ed5e6a8e49cb2c8329ae843b

2
test/integration/mergeConflictUndo/expected/.git_keep/refs/heads/develop

@ -1 +1 @@
8b7aa507318e42a4efdae2c867d89590bbce48e5
8f9f24614460289546a49cb6f12a72b764af14f5

2
test/integration/mergeConflictUndo/expected/.git_keep/refs/heads/feature/cherry-picking

@ -1 +1 @@
7d80e0ed109e6802aa1f23a473200c9af3f8cf61
05a37c1f6dc7942f15f80d45254d38735918f670

2
test/integration/mergeConflictUndo/expected/.git_keep/refs/heads/master

@ -1 +1 @@
5e9fe3aa0c84eab154f6f8796804b9e2e0ab0401
9c09cc9177a699a0a920d8c2a84cd2de68295382

2
test/integration/mergeConflictUndo/expected/.git_keep/refs/heads/other_branch

@ -1 +1 @@
0a71a0176c3eb0a7ccba7e8e675743aecb362f3a
c622516f02266679505b89103007ec04b8748b67

4
test/integration/mergeConflictUndo/expected/directory/file

@ -1 +1,5 @@
<<<<<<< HEAD
test3
=======
test2
>>>>>>> develop

4
test/integration/mergeConflictUndo/expected/directory/file2

@ -1 +1,5 @@
<<<<<<< HEAD
test3
=======
test2
>>>>>>> develop

4
test/integration/mergeConflictUndo/expected/file3

@ -1 +1,5 @@
<<<<<<< HEAD
once upon a time there was a horse
=======
once upon a time there was a mouse
>>>>>>> develop

4
test/integration/mergeConflictUndo/expected/file4

@ -1 +1,5 @@
<<<<<<< HEAD
once upon a time there was a horse
=======
once upon a time there was a mouse
>>>>>>> develop

4
test/integration/mergeConflictUndo/expected/file5

@ -1 +1,5 @@
<<<<<<< HEAD
once upon a time there was a horse
=======
once upon a time there was a mouse
>>>>>>> develop

2
test/integration/mergeConflictUndo/recording.json

File diff suppressed because one or more lines are too long