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

more thorough merge conflict integration test

Browse Source
This commit is contained in:
Jesse Duffield 2021-04-02 08:31:30 +11:00
parent f7772f00c4
commit 1abb3cd566
80 changed files with 109 additions and 122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
test/integration/mergeConflicts/expected/.git_keep/COMMIT_EDITMSG
View File

@ -1,20 +1 @@
Merge branch 'base_branch' into other_branch
# Conflicts:
# file
#
# 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/mergeConflicts/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:
# modified: file
#
asd

2
test/integration/mergeConflicts/expected/.git_keep/ORIG_HEAD
View File

@ -1 +1 @@
659aa732ccda1aaa1cd6564fdb93bf0445b5115a
e00ef3be7687b4a13bf23199fe9c01767e9b98bc

BIN
test/integration/mergeConflicts/expected/.git_keep/index
View File

Binary file not shown.

69
test/integration/mergeConflicts/expected/.git_keep/logs/HEAD
View File

@ -1,34 +1,35 @@
0000000000000000000000000000000000000000 705e4e70fae7dd1ea607b6ad0727bed681fa3de1 CI <CI@example.com> 1601981290 +1100 commit (initial): first commit
705e4e70fae7dd1ea607b6ad0727bed681fa3de1 705e4e70fae7dd1ea607b6ad0727bed681fa3de1 CI <CI@example.com> 1601981290 +1100 checkout: moving from master to feature/cherry-picking
705e4e70fae7dd1ea607b6ad0727bed681fa3de1 02caf2708fbff792572b0c30efaeddd214525c94 CI <CI@example.com> 1601981290 +1100 commit: first commit freshman year
02caf2708fbff792572b0c30efaeddd214525c94 f5794ed7a2233f8a01fea032de77d2bc6a02aaec CI <CI@example.com> 1601981290 +1100 commit: second commit subway eat fresh
f5794ed7a2233f8a01fea032de77d2bc6a02aaec 4d81feb29b83b1a26754d0f480427a13dce491f4 CI <CI@example.com> 1601981290 +1100 commit: third commit fresh
4d81feb29b83b1a26754d0f480427a13dce491f4 4e3f39dbce8ac07b560685d22d761138954a864a CI <CI@example.com> 1601981290 +1100 commit: fourth commit cool
4e3f39dbce8ac07b560685d22d761138954a864a 223a2caff009cc142bfa9b5889963a75c8004e8a CI <CI@example.com> 1601981290 +1100 commit: fifth commit nice
223a2caff009cc142bfa9b5889963a75c8004e8a b26567e4fd73c518dd6531825d81a389fa49fe03 CI <CI@example.com> 1601981290 +1100 commit: sixth commit haha
b26567e4fd73c518dd6531825d81a389fa49fe03 bfe07eeabbfcde2e7d6856918dd494c703864b20 CI <CI@example.com> 1601981290 +1100 commit: seventh commit yeah
bfe07eeabbfcde2e7d6856918dd494c703864b20 1bbb146d9ce5c8ae1d34b7bc63fe7288adc0c26b CI <CI@example.com> 1601981290 +1100 commit: eighth commit woo
1bbb146d9ce5c8ae1d34b7bc63fe7288adc0c26b 1bbb146d9ce5c8ae1d34b7bc63fe7288adc0c26b CI <CI@example.com> 1601981290 +1100 checkout: moving from feature/cherry-picking to develop
1bbb146d9ce5c8ae1d34b7bc63fe7288adc0c26b 27bff1745d1ab39754071c9b225971867ea2a8a8 CI <CI@example.com> 1601981290 +1100 commit: first commit on develop
27bff1745d1ab39754071c9b225971867ea2a8a8 705e4e70fae7dd1ea607b6ad0727bed681fa3de1 CI <CI@example.com> 1601981290 +1100 checkout: moving from develop to master
705e4e70fae7dd1ea607b6ad0727bed681fa3de1 07392b739784503a325278fedf5251ecb7c3bca9 CI <CI@example.com> 1601981290 +1100 commit: first commit on master
07392b739784503a325278fedf5251ecb7c3bca9 27bff1745d1ab39754071c9b225971867ea2a8a8 CI <CI@example.com> 1601981290 +1100 checkout: moving from master to develop
27bff1745d1ab39754071c9b225971867ea2a8a8 6573f823441ea560245f56e735d7cbc972607341 CI <CI@example.com> 1601981290 +1100 commit: second commit on develop
6573f823441ea560245f56e735d7cbc972607341 07392b739784503a325278fedf5251ecb7c3bca9 CI <CI@example.com> 1601981290 +1100 checkout: moving from develop to master
07392b739784503a325278fedf5251ecb7c3bca9 a2c097a7f46ce0bc1f1e5a17b280a574f34d4a21 CI <CI@example.com> 1601981290 +1100 commit: second commit on master
a2c097a7f46ce0bc1f1e5a17b280a574f34d4a21 6573f823441ea560245f56e735d7cbc972607341 CI <CI@example.com> 1601981290 +1100 checkout: moving from master to develop
6573f823441ea560245f56e735d7cbc972607341 de8c7134958792e1bff9b33cca090287def37f7e CI <CI@example.com> 1601981290 +1100 commit: third commit on develop
de8c7134958792e1bff9b33cca090287def37f7e a2c097a7f46ce0bc1f1e5a17b280a574f34d4a21 CI <CI@example.com> 1601981290 +1100 checkout: moving from develop to master
a2c097a7f46ce0bc1f1e5a17b280a574f34d4a21 d09f332ddbdbb1d516ca99da33b23f987e4c13c3 CI <CI@example.com> 1601981290 +1100 commit: third commit on master
d09f332ddbdbb1d516ca99da33b23f987e4c13c3 de8c7134958792e1bff9b33cca090287def37f7e CI <CI@example.com> 1601981290 +1100 checkout: moving from master to develop
de8c7134958792e1bff9b33cca090287def37f7e 149c4365ab13dfb2ef4dd1e2c1eec0f3b6be2ed9 CI <CI@example.com> 1601981290 +1100 commit: fourth commit on develop
149c4365ab13dfb2ef4dd1e2c1eec0f3b6be2ed9 d09f332ddbdbb1d516ca99da33b23f987e4c13c3 CI <CI@example.com> 1601981290 +1100 checkout: moving from develop to master
d09f332ddbdbb1d516ca99da33b23f987e4c13c3 e217a1e8fe2e038fdc59202dee120f081ecf458f CI <CI@example.com> 1601981290 +1100 commit: fourth commit on master
e217a1e8fe2e038fdc59202dee120f081ecf458f e217a1e8fe2e038fdc59202dee120f081ecf458f CI <CI@example.com> 1601981290 +1100 checkout: moving from master to base_branch
e217a1e8fe2e038fdc59202dee120f081ecf458f 8580d8908b1bfc6d71971e73812effa15c68ecf3 CI <CI@example.com> 1601981290 +1100 commit: file
8580d8908b1bfc6d71971e73812effa15c68ecf3 8580d8908b1bfc6d71971e73812effa15c68ecf3 CI <CI@example.com> 1601981290 +1100 checkout: moving from base_branch to other_branch
8580d8908b1bfc6d71971e73812effa15c68ecf3 8580d8908b1bfc6d71971e73812effa15c68ecf3 CI <CI@example.com> 1601981290 +1100 checkout: moving from other_branch to base_branch
8580d8908b1bfc6d71971e73812effa15c68ecf3 4a5f9db9c8d46ac099de054e42e17a157ee3909b CI <CI@example.com> 1601981290 +1100 commit: file changed
4a5f9db9c8d46ac099de054e42e17a157ee3909b 8580d8908b1bfc6d71971e73812effa15c68ecf3 CI <CI@example.com> 1601981290 +1100 checkout: moving from base_branch to other_branch
8580d8908b1bfc6d71971e73812effa15c68ecf3 659aa732ccda1aaa1cd6564fdb93bf0445b5115a CI <CI@example.com> 1601981293 +1100 commit: asd
659aa732ccda1aaa1cd6564fdb93bf0445b5115a ed21fe1044b8600683ec6c2abbf86195a4d55461 CI <CI@example.com> 1601981298 +1100 commit (merge): Merge branch 'base_branch' into other_branch
0000000000000000000000000000000000000000 495a8676a677db2fcd6963abc94685ab87f0f1e2 CI <CI@example.com> 1617312234 +1100 commit (initial): first commit
495a8676a677db2fcd6963abc94685ab87f0f1e2 495a8676a677db2fcd6963abc94685ab87f0f1e2 CI <CI@example.com> 1617312234 +1100 checkout: moving from master to feature/cherry-picking
495a8676a677db2fcd6963abc94685ab87f0f1e2 78d8f05867a79068cf661a3654e1e221f6fdc5d8 CI <CI@example.com> 1617312234 +1100 commit: first commit freshman year
78d8f05867a79068cf661a3654e1e221f6fdc5d8 9fe32ee7a110dbab694c978f1b03fa45f7cd7db6 CI <CI@example.com> 1617312234 +1100 commit: second commit subway eat fresh
9fe32ee7a110dbab694c978f1b03fa45f7cd7db6 9119187695a5b19287b68b0732f9142eee7dc221 CI <CI@example.com> 1617312234 +1100 commit: third commit fresh
9119187695a5b19287b68b0732f9142eee7dc221 fd64b741be226a9fe125acf45a438c089a845fea CI <CI@example.com> 1617312234 +1100 commit: fourth commit cool
fd64b741be226a9fe125acf45a438c089a845fea 47de5d2b09400df9f5252bfb02ecb0cf2702fd3e CI <CI@example.com> 1617312234 +1100 commit: fifth commit nice
47de5d2b09400df9f5252bfb02ecb0cf2702fd3e 34325b634a636cb6f7fcff24cd010405e459cf90 CI <CI@example.com> 1617312234 +1100 commit: sixth commit haha
34325b634a636cb6f7fcff24cd010405e459cf90 bcad87f16cdd4fd10adbf9a1976671bad9b0c8aa CI <CI@example.com> 1617312234 +1100 commit: seventh commit yeah
bcad87f16cdd4fd10adbf9a1976671bad9b0c8aa 7e28009fced47639d5a8b45ec229bcfcc265066a CI <CI@example.com> 1617312234 +1100 commit: eighth commit woo
7e28009fced47639d5a8b45ec229bcfcc265066a 7e28009fced47639d5a8b45ec229bcfcc265066a CI <CI@example.com> 1617312234 +1100 checkout: moving from feature/cherry-picking to develop
7e28009fced47639d5a8b45ec229bcfcc265066a ce0674441b6de3c180f4cf1ff1cdf61cf8d7aa98 CI <CI@example.com> 1617312234 +1100 commit: first commit on develop
ce0674441b6de3c180f4cf1ff1cdf61cf8d7aa98 495a8676a677db2fcd6963abc94685ab87f0f1e2 CI <CI@example.com> 1617312235 +1100 checkout: moving from develop to master
495a8676a677db2fcd6963abc94685ab87f0f1e2 4c6b27ac04033b33a0f84869ec015b6361f28f31 CI <CI@example.com> 1617312235 +1100 commit: first commit on master
4c6b27ac04033b33a0f84869ec015b6361f28f31 ce0674441b6de3c180f4cf1ff1cdf61cf8d7aa98 CI <CI@example.com> 1617312235 +1100 checkout: moving from master to develop
ce0674441b6de3c180f4cf1ff1cdf61cf8d7aa98 c21e6aeba03d5176c28b213be71d3a02e4966c87 CI <CI@example.com> 1617312235 +1100 commit: second commit on develop
c21e6aeba03d5176c28b213be71d3a02e4966c87 4c6b27ac04033b33a0f84869ec015b6361f28f31 CI <CI@example.com> 1617312235 +1100 checkout: moving from develop to master
4c6b27ac04033b33a0f84869ec015b6361f28f31 9a415e7414f26bbb93a9369576b6135e29bc7391 CI <CI@example.com> 1617312235 +1100 commit: second commit on master
9a415e7414f26bbb93a9369576b6135e29bc7391 c21e6aeba03d5176c28b213be71d3a02e4966c87 CI <CI@example.com> 1617312235 +1100 checkout: moving from master to develop
c21e6aeba03d5176c28b213be71d3a02e4966c87 2d1c52f1a9818ac62a981dbf9f7a95bd5aa0bf2e CI <CI@example.com> 1617312235 +1100 commit: third commit on develop
2d1c52f1a9818ac62a981dbf9f7a95bd5aa0bf2e 9a415e7414f26bbb93a9369576b6135e29bc7391 CI <CI@example.com> 1617312235 +1100 checkout: moving from develop to master
9a415e7414f26bbb93a9369576b6135e29bc7391 43e480c08cf3864f85bef1d5698b91786926cb58 CI <CI@example.com> 1617312235 +1100 commit: third commit on master
43e480c08cf3864f85bef1d5698b91786926cb58 2d1c52f1a9818ac62a981dbf9f7a95bd5aa0bf2e CI <CI@example.com> 1617312235 +1100 checkout: moving from master to develop
2d1c52f1a9818ac62a981dbf9f7a95bd5aa0bf2e 51c0794d2dfd4eb71cc06f5e894edd3931411057 CI <CI@example.com> 1617312235 +1100 commit: fourth commit on develop
51c0794d2dfd4eb71cc06f5e894edd3931411057 43e480c08cf3864f85bef1d5698b91786926cb58 CI <CI@example.com> 1617312235 +1100 checkout: moving from develop to master
43e480c08cf3864f85bef1d5698b91786926cb58 258864d877e7897048a0894cad34fad2a5a4c709 CI <CI@example.com> 1617312235 +1100 commit: fourth commit on master
258864d877e7897048a0894cad34fad2a5a4c709 258864d877e7897048a0894cad34fad2a5a4c709 CI <CI@example.com> 1617312235 +1100 checkout: moving from master to base_branch
258864d877e7897048a0894cad34fad2a5a4c709 5d7d612ecff0165ff92363cdf90acda30170038e CI <CI@example.com> 1617312235 +1100 commit: file
5d7d612ecff0165ff92363cdf90acda30170038e 5d7d612ecff0165ff92363cdf90acda30170038e CI <CI@example.com> 1617312235 +1100 checkout: moving from base_branch to other_branch
5d7d612ecff0165ff92363cdf90acda30170038e 5d7d612ecff0165ff92363cdf90acda30170038e CI <CI@example.com> 1617312235 +1100 checkout: moving from other_branch to base_branch
5d7d612ecff0165ff92363cdf90acda30170038e c28b32178002cb0046454f34e77f3d86391e748d CI <CI@example.com> 1617312235 +1100 commit: file changed
c28b32178002cb0046454f34e77f3d86391e748d 5d7d612ecff0165ff92363cdf90acda30170038e CI <CI@example.com> 1617312235 +1100 checkout: moving from base_branch to other_branch
5d7d612ecff0165ff92363cdf90acda30170038e e00ef3be7687b4a13bf23199fe9c01767e9b98bc CI <CI@example.com> 1617312236 +1100 commit: asd
e00ef3be7687b4a13bf23199fe9c01767e9b98bc 669e34b018f5e04940e15bd9d62465c716932039 CI <CI@example.com> 1617312262 +1100 commit (merge): Merge branch 'develop' into other_branch
669e34b018f5e04940e15bd9d62465c716932039 4ea473079cfdf1776e0d7dc114501860b8ab40c4 CI <CI@example.com> 1617312266 +1100 commit: asd

6
test/integration/mergeConflicts/expected/.git_keep/logs/refs/heads/base_branch
View File

@ -1,3 +1,3 @@
0000000000000000000000000000000000000000 e217a1e8fe2e038fdc59202dee120f081ecf458f CI <CI@example.com> 1601981290 +1100 branch: Created from HEAD
e217a1e8fe2e038fdc59202dee120f081ecf458f 8580d8908b1bfc6d71971e73812effa15c68ecf3 CI <CI@example.com> 1601981290 +1100 commit: file
8580d8908b1bfc6d71971e73812effa15c68ecf3 4a5f9db9c8d46ac099de054e42e17a157ee3909b CI <CI@example.com> 1601981290 +1100 commit: file changed
0000000000000000000000000000000000000000 258864d877e7897048a0894cad34fad2a5a4c709 CI <CI@example.com> 1617312235 +1100 branch: Created from HEAD
258864d877e7897048a0894cad34fad2a5a4c709 5d7d612ecff0165ff92363cdf90acda30170038e CI <CI@example.com> 1617312235 +1100 commit: file
5d7d612ecff0165ff92363cdf90acda30170038e c28b32178002cb0046454f34e77f3d86391e748d CI <CI@example.com> 1617312235 +1100 commit: file changed

10
test/integration/mergeConflicts/expected/.git_keep/logs/refs/heads/develop
View File

@ -1,5 +1,5 @@
0000000000000000000000000000000000000000 1bbb146d9ce5c8ae1d34b7bc63fe7288adc0c26b CI <CI@example.com> 1601981290 +1100 branch: Created from HEAD
1bbb146d9ce5c8ae1d34b7bc63fe7288adc0c26b 27bff1745d1ab39754071c9b225971867ea2a8a8 CI <CI@example.com> 1601981290 +1100 commit: first commit on develop
27bff1745d1ab39754071c9b225971867ea2a8a8 6573f823441ea560245f56e735d7cbc972607341 CI <CI@example.com> 1601981290 +1100 commit: second commit on develop
6573f823441ea560245f56e735d7cbc972607341 de8c7134958792e1bff9b33cca090287def37f7e CI <CI@example.com> 1601981290 +1100 commit: third commit on develop
de8c7134958792e1bff9b33cca090287def37f7e 149c4365ab13dfb2ef4dd1e2c1eec0f3b6be2ed9 CI <CI@example.com> 1601981290 +1100 commit: fourth commit on develop
0000000000000000000000000000000000000000 7e28009fced47639d5a8b45ec229bcfcc265066a CI <CI@example.com> 1617312234 +1100 branch: Created from HEAD
7e28009fced47639d5a8b45ec229bcfcc265066a ce0674441b6de3c180f4cf1ff1cdf61cf8d7aa98 CI <CI@example.com> 1617312234 +1100 commit: first commit on develop
ce0674441b6de3c180f4cf1ff1cdf61cf8d7aa98 c21e6aeba03d5176c28b213be71d3a02e4966c87 CI <CI@example.com> 1617312235 +1100 commit: second commit on develop
c21e6aeba03d5176c28b213be71d3a02e4966c87 2d1c52f1a9818ac62a981dbf9f7a95bd5aa0bf2e CI <CI@example.com> 1617312235 +1100 commit: third commit on develop
2d1c52f1a9818ac62a981dbf9f7a95bd5aa0bf2e 51c0794d2dfd4eb71cc06f5e894edd3931411057 CI <CI@example.com> 1617312235 +1100 commit: fourth commit on develop

18
test/integration/mergeConflicts/expected/.git_keep/logs/refs/heads/feature/cherry-picking
View File

@ -1,9 +1,9 @@
0000000000000000000000000000000000000000 705e4e70fae7dd1ea607b6ad0727bed681fa3de1 CI <CI@example.com> 1601981290 +1100 branch: Created from HEAD
705e4e70fae7dd1ea607b6ad0727bed681fa3de1 02caf2708fbff792572b0c30efaeddd214525c94 CI <CI@example.com> 1601981290 +1100 commit: first commit freshman year
02caf2708fbff792572b0c30efaeddd214525c94 f5794ed7a2233f8a01fea032de77d2bc6a02aaec CI <CI@example.com> 1601981290 +1100 commit: second commit subway eat fresh
f5794ed7a2233f8a01fea032de77d2bc6a02aaec 4d81feb29b83b1a26754d0f480427a13dce491f4 CI <CI@example.com> 1601981290 +1100 commit: third commit fresh
4d81feb29b83b1a26754d0f480427a13dce491f4 4e3f39dbce8ac07b560685d22d761138954a864a CI <CI@example.com> 1601981290 +1100 commit: fourth commit cool
4e3f39dbce8ac07b560685d22d761138954a864a 223a2caff009cc142bfa9b5889963a75c8004e8a CI <CI@example.com> 1601981290 +1100 commit: fifth commit nice
223a2caff009cc142bfa9b5889963a75c8004e8a b26567e4fd73c518dd6531825d81a389fa49fe03 CI <CI@example.com> 1601981290 +1100 commit: sixth commit haha
b26567e4fd73c518dd6531825d81a389fa49fe03 bfe07eeabbfcde2e7d6856918dd494c703864b20 CI <CI@example.com> 1601981290 +1100 commit: seventh commit yeah
bfe07eeabbfcde2e7d6856918dd494c703864b20 1bbb146d9ce5c8ae1d34b7bc63fe7288adc0c26b CI <CI@example.com> 1601981290 +1100 commit: eighth commit woo
0000000000000000000000000000000000000000 495a8676a677db2fcd6963abc94685ab87f0f1e2 CI <CI@example.com> 1617312234 +1100 branch: Created from HEAD
495a8676a677db2fcd6963abc94685ab87f0f1e2 78d8f05867a79068cf661a3654e1e221f6fdc5d8 CI <CI@example.com> 1617312234 +1100 commit: first commit freshman year
78d8f05867a79068cf661a3654e1e221f6fdc5d8 9fe32ee7a110dbab694c978f1b03fa45f7cd7db6 CI <CI@example.com> 1617312234 +1100 commit: second commit subway eat fresh
9fe32ee7a110dbab694c978f1b03fa45f7cd7db6 9119187695a5b19287b68b0732f9142eee7dc221 CI <CI@example.com> 1617312234 +1100 commit: third commit fresh
9119187695a5b19287b68b0732f9142eee7dc221 fd64b741be226a9fe125acf45a438c089a845fea CI <CI@example.com> 1617312234 +1100 commit: fourth commit cool
fd64b741be226a9fe125acf45a438c089a845fea 47de5d2b09400df9f5252bfb02ecb0cf2702fd3e CI <CI@example.com> 1617312234 +1100 commit: fifth commit nice
47de5d2b09400df9f5252bfb02ecb0cf2702fd3e 34325b634a636cb6f7fcff24cd010405e459cf90 CI <CI@example.com> 1617312234 +1100 commit: sixth commit haha
34325b634a636cb6f7fcff24cd010405e459cf90 bcad87f16cdd4fd10adbf9a1976671bad9b0c8aa CI <CI@example.com> 1617312234 +1100 commit: seventh commit yeah
bcad87f16cdd4fd10adbf9a1976671bad9b0c8aa 7e28009fced47639d5a8b45ec229bcfcc265066a CI <CI@example.com> 1617312234 +1100 commit: eighth commit woo

10
test/integration/mergeConflicts/expected/.git_keep/logs/refs/heads/master
View File

@ -1,5 +1,5 @@
0000000000000000000000000000000000000000 705e4e70fae7dd1ea607b6ad0727bed681fa3de1 CI <CI@example.com> 1601981290 +1100 commit (initial): first commit
705e4e70fae7dd1ea607b6ad0727bed681fa3de1 07392b739784503a325278fedf5251ecb7c3bca9 CI <CI@example.com> 1601981290 +1100 commit: first commit on master
07392b739784503a325278fedf5251ecb7c3bca9 a2c097a7f46ce0bc1f1e5a17b280a574f34d4a21 CI <CI@example.com> 1601981290 +1100 commit: second commit on master
a2c097a7f46ce0bc1f1e5a17b280a574f34d4a21 d09f332ddbdbb1d516ca99da33b23f987e4c13c3 CI <CI@example.com> 1601981290 +1100 commit: third commit on master
d09f332ddbdbb1d516ca99da33b23f987e4c13c3 e217a1e8fe2e038fdc59202dee120f081ecf458f CI <CI@example.com> 1601981290 +1100 commit: fourth commit on master
0000000000000000000000000000000000000000 495a8676a677db2fcd6963abc94685ab87f0f1e2 CI <CI@example.com> 1617312234 +1100 commit (initial): first commit
495a8676a677db2fcd6963abc94685ab87f0f1e2 4c6b27ac04033b33a0f84869ec015b6361f28f31 CI <CI@example.com> 1617312235 +1100 commit: first commit on master
4c6b27ac04033b33a0f84869ec015b6361f28f31 9a415e7414f26bbb93a9369576b6135e29bc7391 CI <CI@example.com> 1617312235 +1100 commit: second commit on master
9a415e7414f26bbb93a9369576b6135e29bc7391 43e480c08cf3864f85bef1d5698b91786926cb58 CI <CI@example.com> 1617312235 +1100 commit: third commit on master
43e480c08cf3864f85bef1d5698b91786926cb58 258864d877e7897048a0894cad34fad2a5a4c709 CI <CI@example.com> 1617312235 +1100 commit: fourth commit on master

7
test/integration/mergeConflicts/expected/.git_keep/logs/refs/heads/other_branch
View File

@ -1,3 +1,4 @@
0000000000000000000000000000000000000000 8580d8908b1bfc6d71971e73812effa15c68ecf3 CI <CI@example.com> 1601981290 +1100 branch: Created from HEAD
8580d8908b1bfc6d71971e73812effa15c68ecf3 659aa732ccda1aaa1cd6564fdb93bf0445b5115a CI <CI@example.com> 1601981293 +1100 commit: asd
659aa732ccda1aaa1cd6564fdb93bf0445b5115a ed21fe1044b8600683ec6c2abbf86195a4d55461 CI <CI@example.com> 1601981298 +1100 commit (merge): Merge branch 'base_branch' into other_branch
0000000000000000000000000000000000000000 5d7d612ecff0165ff92363cdf90acda30170038e CI <CI@example.com> 1617312235 +1100 branch: Created from HEAD
5d7d612ecff0165ff92363cdf90acda30170038e e00ef3be7687b4a13bf23199fe9c01767e9b98bc CI <CI@example.com> 1617312236 +1100 commit: asd
e00ef3be7687b4a13bf23199fe9c01767e9b98bc 669e34b018f5e04940e15bd9d62465c716932039 CI <CI@example.com> 1617312262 +1100 commit (merge): Merge branch 'develop' into other_branch
669e34b018f5e04940e15bd9d62465c716932039 4ea473079cfdf1776e0d7dc114501860b8ab40c4 CI <CI@example.com> 1617312266 +1100 commit: asd

3
test/integration/mergeConflicts/expected/.git_keep/objects/02/caf2708fbff792572b0c30efaeddd214525c94
View File

@ -1,3 +0,0 @@
x��Α
Β0=η+φ.ΘnZ“D„�ϊ›δ…
ΖJ� oΑπ:ΜΐΔµ”k#+έ®U€,bD’}o{pκ²uΤΖ\ΘΠ¬:�‡Vάy>Ά‡η¬π) Τ±N{λ’$k— F_mY+M3�¦ω‚·–Η ‡Έ–3‰c±#Σ^„Ωlt›jψS7ωZ��~ε�ηRτNh5_$PD

BIN
test/integration/mergeConflicts/expected/.git_keep/objects/07/392b739784503a325278fedf5251ecb7c3bca9
View File

Binary file not shown.

BIN
test/integration/mergeConflicts/expected/.git_keep/objects/14/9c4365ab13dfb2ef4dd1e2c1eec0f3b6be2ed9
View File

Binary file not shown.

5
test/integration/mergeConflicts/expected/.git_keep/objects/1b/bb146d9ce5c8ae1d34b7bc63fe7288adc0c26b
View File

@ -1,5 +0,0 @@
x��K
Β0@]η³d&M& �]υωL¬`M)=Ύ/ΰφρΌά–εήA£9τM��Ή�‰9%­c��5Z
�ΩUKωl�Zγ&Ο©
:‘�RΝE΄ΈΒήr _� &;<›¤QΕW�ΫγηqΊΚ'.λCNΉ- F
�t@8!��ξS]ώΤ•άos�α—Α»5υ<φ>'

BIN
test/integration/mergeConflicts/expected/.git_keep/objects/22/3a2caff009cc142bfa9b5889963a75c8004e8a
View File

Binary file not shown.

2
test/integration/mergeConflicts/expected/.git_keep/objects/25/8864d877e7897048a0894cad34fad2a5a4c709 Normal file
View File

@ -0,0 +1,2 @@
x�ŽM
Â0F]ç³$Óüt"‚«#™ÎPÁ˜R#x| ^Àíã{|�[­÷ÚCßDÀy=FÑI9dÅÑf‹¨™rQ™ç³Yó&ÏÞ‰'Ë–XE¯Š(Î!&* GŠiˆ\™üîKÛà6Áù6]å“ëú�·z�ýnt8 .ÀÑZ³Ó=ªËŸs£í½õ~´'ÔüÚmón@Ö

BIN
test/integration/mergeConflicts/expected/.git_keep/objects/27/bff1745d1ab39754071c9b225971867ea2a8a8
View File

Binary file not shown.

BIN
test/integration/mergeConflicts/expected/.git_keep/objects/2d/1c52f1a9818ac62a981dbf9f7a95bd5aa0bf2e Normal file
View File

Binary file not shown.

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

Binary file not shown.

BIN
test/integration/mergeConflicts/expected/.git_keep/objects/34/325b634a636cb6f7fcff24cd010405e459cf90 Normal file
View File

Binary file not shown.

2
test/integration/mergeConflicts/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|Æ

2
test/integration/mergeConflicts/expected/.git_keep/objects/43/e480c08cf3864f85bef1d5698b91786926cb58 Normal file
View File

@ -0,0 +1,2 @@
x�ŽK
Â0@]ç³$“Éo@DèªÇ˜´SZ0¶Ôß‚pûxÞ°Öº4p–OmW‡)Ë”‚%¦cÈ1y¹¨}žÄgR/“Ùd×g�A“G?¹XJa¦È!Å‘‚:.C"F#ï6¯;t=\»þ®©ÛC/ÃZo€¡sàŒh­9è1ÕôOÝ´yÙGøU°>¡ÊëˆÍf(>X

BIN
test/integration/mergeConflicts/expected/.git_keep/objects/47/de5d2b09400df9f5252bfb02ecb0cf2702fd3e Normal file
View File

Binary file not shown.

BIN
test/integration/mergeConflicts/expected/.git_keep/objects/49/5a8676a677db2fcd6963abc94685ab87f0f1e2 Normal file
View File

Binary file not shown.

3
test/integration/mergeConflicts/expected/.git_keep/objects/4a/5f9db9c8d46ac099de054e42e17a157ee3909b
View File

@ -1,3 +0,0 @@
x�ŽK
Â0@]ç³$“¦™ ˆ]õÉdb öC‰àñíÜ>Þƒ'Û²Ì 0ÆK;T¡¢B•2“'bÁT¬Ô˜4«ïUœw$TÔ™=º6àžmáh9c®
a$Tê�Öš°—À*µ3éÓ¦í€a„û0>õ›–ý­7Ù–`°Ï Z¸"ZkNzN5ýS7u~+Ȕ֗ójú<Å

2
test/integration/mergeConflicts/expected/.git_keep/objects/4c/6b27ac04033b33a0f84869ec015b6361f28f31 Normal file
View File

@ -0,0 +1,2 @@
x�ŽK
1D]ç½dòOƒˆ0«9F'ÓÁc†L�oÀ ¸­W¯¨TKÙ:¨ O½1ƒÍš�Å�#”*O-™€ÁÍèQ�‚ÊZìÔøÕÁ œwä¼_£Êiuè4Å„ÆK1ø1!Y z÷Gm0/p�—;¨ìO¾¤Zn �ôZ*¥-œ¥œ&1ÒqªóŸu‘·vtøYP_Pè²øèA?@

BIN
test/integration/mergeConflicts/expected/.git_keep/objects/4d/81feb29b83b1a26754d0f480427a13dce491f4
View File

Binary file not shown.

BIN
test/integration/mergeConflicts/expected/.git_keep/objects/4e/3f39dbce8ac07b560685d22d761138954a864a
View File

Binary file not shown.

2
test/integration/mergeConflicts/expected/.git_keep/objects/4e/a473079cfdf1776e0d7dc114501860b8ab40c4 Normal file
View File

@ -0,0 +1,2 @@
x�ÎM
1 @a×=Eö‚$ýIS\Í1:mŠ‚u†±‚ÇwŽàöñ-^Yz  „‡±©B²©bË1øf›Ôscñèkn"!Vq¥™5oúÀœÔùIZPôÉ£R˜kªl=‡‰“³è’ÉŸq_6¸Mp¾MWýæ¾>õT–~bŠŽ¬e†#¢Ùë>5ôOnò»š\�7�

3
test/integration/mergeConflicts/expected/.git_keep/objects/51/c0794d2dfd4eb71cc06f5e894edd3931411057 Normal file
View File

@ -0,0 +1,3 @@
x�ŽA
à E»ö³/ÇhT(¥�UŽ1êH
±1¥ÇoJ/ÐÝçñüXKytPˆ§Þ˜�‰´‹yHÚ2\ÊÚ†•vì=*ic’بñóF£2’wè(Žê;RÈ>[ò&$C$CV,hïKm0Íp�æ;¿©l+_b-7Àí€J ΈRŠƒ§:ÿ©‹\÷ÖøePŸ�øÅkÝÄÚ©B9

BIN
test/integration/mergeConflicts/expected/.git_keep/objects/5d/7d612ecff0165ff92363cdf90acda30170038e Normal file
View File

Binary file not shown.

2
test/integration/mergeConflicts/expected/.git_keep/objects/65/73f823441ea560245f56e735d7cbc972607341
View File

@ -1,2 +0,0 @@
x█▌K
б0@]ГЁd&IС║╚c▓≥╒`⌡R╚x| ^юМЦ=x╣Mс}KtьVUеQU▌┼%hГ╪MXтy)I$┘*б1 ┘W²В0√q╓Х;!..гнc╓ ▀╣]▌■BT╤°8~m╥╤B?ю╧╝ЗАiyХ╘╤И░r"⌡▌D┬f╖Шт╕ЙФ╘╣м© з ╒o}╢е|+@ы

BIN
test/integration/mergeConflicts/expected/.git_keep/objects/65/9aa732ccda1aaa1cd6564fdb93bf0445b5115a
View File

Binary file not shown.

BIN
test/integration/mergeConflicts/expected/.git_keep/objects/66/9e34b018f5e04940e15bd9d62465c716932039 Normal file
View File

Binary file not shown.

BIN
test/integration/mergeConflicts/expected/.git_keep/objects/70/5e4e70fae7dd1ea607b6ad0727bed681fa3de1
View File

Binary file not shown.

BIN
test/integration/mergeConflicts/expected/.git_keep/objects/78/129d0f826754f2f8da7af68404daf8857d83cf Normal file
View File

Binary file not shown.

BIN
test/integration/mergeConflicts/expected/.git_keep/objects/78/d8f05867a79068cf661a3654e1e221f6fdc5d8 Normal file
View File

Binary file not shown.

BIN
test/integration/mergeConflicts/expected/.git_keep/objects/7e/28009fced47639d5a8b45ec229bcfcc265066a Normal file
View File

Binary file not shown.

3
test/integration/mergeConflicts/expected/.git_keep/objects/85/80d8908b1bfc6d71971e73812effa15c68ecf3
View File

@ -1,3 +0,0 @@
x�ÎA
Â0Fa×9Eö‚ÌŒM3"BW=FšüÁ‚µ¥DðøönßâåuYææÙøÔvÀ iÈZ
%%X@±`èÊ$i2­}?Y¤Tbt[ÚñnÂ11´B@W­%’°P%eäÚ­.}ÚsÝý0úÛ0>ðMËöÂ%¯ËÝsOlÊbäÏÌDî¨ÇTßÜÕù÷{ò9Å

BIN
test/integration/mergeConflicts/expected/.git_keep/objects/86/03b3753f0207a212c71189d6154cd7a06f3f62 Normal file
View File

Binary file not shown.

3
test/integration/mergeConflicts/expected/.git_keep/objects/91/19187695a5b19287b68b0732f9142eee7dc221 Normal file
View File

@ -0,0 +1,3 @@
xŤŽM
Â0F]çł$˙i@DčŞÇČL&´`l‰<ľ/ŕöń˝ŹG{­[-Ý©7fČS
äd¦„VŁFŻŮQ”‰‰˝–ŮDo1[q¤Ćϱ°ŃĚ!)%3&ôŃR SQ(MIÖ•ˇ†Ś^¤w_÷ó×yąó'ŐăÁÚë ”WÁ(­Ť…ó¸‘bĐŐůĎąčëÖ2ü,(Ť_«řtë@

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

Binary file not shown.

4
test/integration/mergeConflicts/expected/.git_keep/objects/9a/415e7414f26bbb93a9369576b6135e29bc7391 Normal file
View File

@ -0,0 +1,4 @@
x�ŽA
1 E]÷Ù ’4�´‚ˆ0«9F3(Ø©Œ<¾^Àå¼_[­÷žp×W3À£K*‘¢¢d¡¥Ä"�rئ/3ë�†«{æÕ–A¥ø˜2æŒs
IŽ¦HCš}š™\~÷[[aœà4Nûäú|ØA[= E&ïy€=¢ÛèvªÛŸº{™¶å
¿ Ú5¿¶Ú}2£?o

BIN
test/integration/mergeConflicts/expected/.git_keep/objects/9f/e32ee7a110dbab694c978f1b03fa45f7cd7db6 Normal file
View File

Binary file not shown.

2
test/integration/mergeConflicts/expected/.git_keep/objects/a2/c097a7f46ce0bc1f1e5a17b280a574f34d4a21
View File

@ -1,2 +0,0 @@
xŤŽM
Â0…]çłd&iţ@DčŞÇH¦SLSÚ߀póŕ=ľ×Rž 4á©í"€‘łvž<ŁKŽ‚wŮg7PzŐy1l�ťŐ–vY 7Qç> M2Új™«- gĎ&sŠ*˝ŰŁî0Np§»|RŮ^ráZn@)ŇáL„¨úÚO5ůW‡p]gřiPW(éč¶úFQ?Â

BIN
test/integration/mergeConflicts/expected/.git_keep/objects/a4/6fe3d80027b2887996ba65853fb0591915d051 Normal file
View File

Binary file not shown.

BIN
test/integration/mergeConflicts/expected/.git_keep/objects/b2/6567e4fd73c518dd6531825d81a389fa49fe03
View File

Binary file not shown.

3
test/integration/mergeConflicts/expected/.git_keep/objects/bc/ad87f16cdd4fd10adbf9a1976671bad9b0c8aa Normal file
View File

@ -0,0 +1,3 @@
xŤŽK
Â0@]çłd&_"BW=Ć$™PÁŘRŁčí-x·Ź÷ŕĺąµkŤ~×W(č±­} —Ůą„V"U.:93RâRb4jáUîŚ5Ú%o,{ăsň5Ô\«¶ą ˇE'ÖĹ\#*~öi^aá4Śys[nrČs;y
†´6öD�jŁŰT—?uő�×ö2ÁŻ�Źđ¤ľ¸Ä>ó

4
test/integration/mergeConflicts/expected/.git_keep/objects/bf/e07eeabbfcde2e7d6856918dd494c703864b20
View File

@ -1,4 +0,0 @@
xЌЋK
В0@]зіd&i~ "tе1&Й„
Ж–EooБ ё}ј/П­];ht»ѕЉ@A‡Хkн<ЩМЦ&$RеўSаМH‰K‰СЁ…W№wHЪYзeЁЕ›l)”в¬Ў m Д&ДКC¬‚FсіOу
гЋге,onЛMyn' ‡й€°'BTЭ¦єь©«‡ј¶— ~|„'х± >и

BIN
test/integration/mergeConflicts/expected/.git_keep/objects/c2/1e6aeba03d5176c28b213be71d3a02e4966c87 Normal file
View File

Binary file not shown.

2
test/integration/mergeConflicts/expected/.git_keep/objects/c2/8b32178002cb0046454f34e77f3d86391e748d Normal file
View File

@ -0,0 +1,2 @@
x�ÎK
Â0€a×9ÅìÉä5 ˆ]õédÆìƒÁãÛ#¸ýù?oË27Àœ/íÅ�˜”ÆŽQÇXªeÍEF QØGLUœÙË!kƒX©&tªSTÍÎ'ÏU³-\‹·HÖúNLù´i; àÞOù–eË�·å˜�<:ç#\­5g=§šüÉ�ÎožÊú’j~ó<Ì

BIN
test/integration/mergeConflicts/expected/.git_keep/objects/ce/0674441b6de3c180f4cf1ff1cdf61cf8d7aa98 Normal file
View File

Binary file not shown.

4
test/integration/mergeConflicts/expected/.git_keep/objects/d0/9f332ddbdbb1d516ca99da33b23f987e4c13c3
View File

@ -1,4 +0,0 @@
x�ÎM
Â0†a×9Åì™É@DèªÇ˜¦Z0¶Äß‚pûñ>ðå­ÖµƒÆtêM4…È%84ÉDï]ŒDÁ¢O“ØÙÆÂ6±\ÔÎMžXgL�C±> N™
‰c
“ŽÈ.ØbÆš¿û²5F¸ã]>\÷‡\òVo@)EÒ áL„¨Žõ8ÕåÏ\õem3ülO¨ü:°úÙ-?/

BIN
test/integration/mergeConflicts/expected/.git_keep/objects/dc/51702c869f97b9ae4e236dc7684c55816fd99a
View File

Binary file not shown.

2
test/integration/mergeConflicts/expected/.git_keep/objects/de/8c7134958792e1bff9b33cca090287def37f7e
View File

@ -1,2 +0,0 @@
xЌЋK
В0@]зіd&їi@DиЄЗH“)-ґM Q<ѕ/ацсјT¶mi  /­Љ@p!s$М‘)¦)рHlG‹СЊv2Р†¤ЋXeoа›©УЖZ’и<jл&з…ЌЛњЖX{dcIЕW›K…~Ђ{?<е·c•[*ЫИ#…Ћt@ё!Є“ћSMюФU›—љбWAЩ!Л[ЦrЁ/вм>о

BIN
test/integration/mergeConflicts/expected/.git_keep/objects/e0/0ef3be7687b4a13bf23199fe9c01767e9b98bc Normal file
View File

Binary file not shown.

BIN
test/integration/mergeConflicts/expected/.git_keep/objects/e2/17a1e8fe2e038fdc59202dee120f081ecf458f
View File

Binary file not shown.

1
test/integration/mergeConflicts/expected/.git_keep/objects/ed/21fe1044b8600683ec6c2abbf86195a4d55461
View File

@ -1 +0,0 @@
x��AJ1E]χ)j7 ARι$Υ"Β¬fα¤R©Ψvg�<Ύ κήε�m�¶m»πΔw£›AΕ�”*ε…ΡΆ(Εie±l!�ϊΰI©��n�m�"‹ΠμU‹ � –S¨%σ�« !ζ�εΟ+§.%$QΗ\ΜΕ`Α’`$³™ηI>ΗΪ:�/πxΎ<Ϋ—l·w{Π¶=&‡Ό ηξ�›zD ϋ§>½X3Θ]v]α”εΓ^Ζ ®ϋhΠΖjύMί»¶VΞ

2
test/integration/mergeConflicts/expected/.git_keep/objects/f5/794ed7a2233f8a01fea032de77d2bc6a02aaec
View File

@ -1,2 +0,0 @@
x�ŽA
Â0E]ç³d2&M"BW=Æ$™PÁš’¦¨··àÜ~Þ{üXæùÞ€´;´*Úî£7ÆÄ̱ë)9ƒÖ'ŸÙ±Îx2ÕÂUž �"grØç�³ódŒg”Ì’R"m,Ù½§xkS©0ŒpÆ›¼y^rŠe¾‚îPû^“G8j�¨öu?ÕäO\­Ë3ÁOƒu /þ€pƒ\e�ÔP9BÉ

BIN
test/integration/mergeConflicts/expected/.git_keep/objects/fd/64b741be226a9fe125acf45a438c089a845fea Normal file
View File

Binary file not shown.

2
test/integration/mergeConflicts/expected/.git_keep/refs/heads/base_branch
View File

@ -1 +1 @@
4a5f9db9c8d46ac099de054e42e17a157ee3909b
c28b32178002cb0046454f34e77f3d86391e748d

2
test/integration/mergeConflicts/expected/.git_keep/refs/heads/develop
View File

@ -1 +1 @@
149c4365ab13dfb2ef4dd1e2c1eec0f3b6be2ed9
51c0794d2dfd4eb71cc06f5e894edd3931411057

2
test/integration/mergeConflicts/expected/.git_keep/refs/heads/feature/cherry-picking
View File

@ -1 +1 @@
1bbb146d9ce5c8ae1d34b7bc63fe7288adc0c26b
7e28009fced47639d5a8b45ec229bcfcc265066a

2
test/integration/mergeConflicts/expected/.git_keep/refs/heads/master
View File

@ -1 +1 @@
e217a1e8fe2e038fdc59202dee120f081ecf458f
258864d877e7897048a0894cad34fad2a5a4c709

2
test/integration/mergeConflicts/expected/.git_keep/refs/heads/other_branch
View File

@ -1 +1 @@
ed21fe1044b8600683ec6c2abbf86195a4d55461
4ea473079cfdf1776e0d7dc114501860b8ab40c4

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

2
test/integration/mergeConflicts/expected/directory/file
View File

@ -1 +1 @@
test3
test2

2
test/integration/mergeConflicts/expected/directory/file2
View File

@ -1 +1 @@
test3
test2

2
test/integration/mergeConflicts/expected/file
View File

@ -1 +1 @@
new1\noriginal2\noriginal3
new2\noriginal2\noriginal3

2
test/integration/mergeConflicts/expected/file3
View File

@ -1 +1 @@
once upon a time there was a horse
once upon a time there was a mouse

1
test/integration/mergeConflicts/expected/file5
View File

@ -1 +1,2 @@
once upon a time there was a horse
once upon a time there was a mouse

2
test/integration/mergeConflicts/recording.json
View File

File diff suppressed because one or more lines are too long

2
test/integration/mergeConflicts/test.json
View File

@ -1 +1 @@
{ "description": "" }
{ "description": "In this test we fix some merge conflicts, ensuring that in the flat tree structure the conflicts are bubbled to the top, and that after resolving the conflicts your cursor stays on the same line, able to select the next conflicted file. We also switch to tree mode and ensure that works too.", "speed": 8 }