diff --git a/test/integration/mergeConflicts/expected/.git_keep/COMMIT_EDITMSG b/test/integration/mergeConflicts/expected/.git_keep/COMMIT_EDITMSG index e4171df59..d72af3146 100644 --- a/test/integration/mergeConflicts/expected/.git_keep/COMMIT_EDITMSG +++ b/test/integration/mergeConflicts/expected/.git_keep/COMMIT_EDITMSG @@ -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 diff --git a/test/integration/mergeConflicts/expected/.git_keep/ORIG_HEAD b/test/integration/mergeConflicts/expected/.git_keep/ORIG_HEAD index 431e026e3..49b9c3b53 100644 --- a/test/integration/mergeConflicts/expected/.git_keep/ORIG_HEAD +++ b/test/integration/mergeConflicts/expected/.git_keep/ORIG_HEAD @@ -1 +1 @@ -659aa732ccda1aaa1cd6564fdb93bf0445b5115a +e00ef3be7687b4a13bf23199fe9c01767e9b98bc diff --git a/test/integration/mergeConflicts/expected/.git_keep/index b/test/integration/mergeConflicts/expected/.git_keep/index index 896aa9430..b010ceb11 100644 Binary files a/test/integration/mergeConflicts/expected/.git_keep/index and b/test/integration/mergeConflicts/expected/.git_keep/index differ diff --git a/test/integration/mergeConflicts/expected/.git_keep/logs/HEAD b/test/integration/mergeConflicts/expected/.git_keep/logs/HEAD index 5d804ed17..706d998e5 100644 --- a/test/integration/mergeConflicts/expected/.git_keep/logs/HEAD +++ b/test/integration/mergeConflicts/expected/.git_keep/logs/HEAD @@ -1,34 +1,35 @@ -0000000000000000000000000000000000000000 705e4e70fae7dd1ea607b6ad0727bed681fa3de1 CI 1601981290 +1100 commit (initial): first commit -705e4e70fae7dd1ea607b6ad0727bed681fa3de1 705e4e70fae7dd1ea607b6ad0727bed681fa3de1 CI 1601981290 +1100 checkout: moving from master to feature/cherry-picking -705e4e70fae7dd1ea607b6ad0727bed681fa3de1 02caf2708fbff792572b0c30efaeddd214525c94 CI 1601981290 +1100 commit: first commit freshman year -02caf2708fbff792572b0c30efaeddd214525c94 f5794ed7a2233f8a01fea032de77d2bc6a02aaec CI 1601981290 +1100 commit: second commit subway eat fresh -f5794ed7a2233f8a01fea032de77d2bc6a02aaec 4d81feb29b83b1a26754d0f480427a13dce491f4 CI 1601981290 +1100 commit: third commit fresh -4d81feb29b83b1a26754d0f480427a13dce491f4 4e3f39dbce8ac07b560685d22d761138954a864a CI 1601981290 +1100 commit: fourth commit cool -4e3f39dbce8ac07b560685d22d761138954a864a 223a2caff009cc142bfa9b5889963a75c8004e8a CI 1601981290 +1100 commit: fifth commit nice -223a2caff009cc142bfa9b5889963a75c8004e8a b26567e4fd73c518dd6531825d81a389fa49fe03 CI 1601981290 +1100 commit: sixth commit haha -b26567e4fd73c518dd6531825d81a389fa49fe03 bfe07eeabbfcde2e7d6856918dd494c703864b20 CI 1601981290 +1100 commit: seventh commit yeah -bfe07eeabbfcde2e7d6856918dd494c703864b20 1bbb146d9ce5c8ae1d34b7bc63fe7288adc0c26b CI 1601981290 +1100 commit: eighth commit woo -1bbb146d9ce5c8ae1d34b7bc63fe7288adc0c26b 1bbb146d9ce5c8ae1d34b7bc63fe7288adc0c26b CI 1601981290 +1100 checkout: moving from feature/cherry-picking to develop -1bbb146d9ce5c8ae1d34b7bc63fe7288adc0c26b 27bff1745d1ab39754071c9b225971867ea2a8a8 CI 1601981290 +1100 commit: first commit on develop -27bff1745d1ab39754071c9b225971867ea2a8a8 705e4e70fae7dd1ea607b6ad0727bed681fa3de1 CI 1601981290 +1100 checkout: moving from develop to master -705e4e70fae7dd1ea607b6ad0727bed681fa3de1 07392b739784503a325278fedf5251ecb7c3bca9 CI 1601981290 +1100 commit: first commit on master -07392b739784503a325278fedf5251ecb7c3bca9 27bff1745d1ab39754071c9b225971867ea2a8a8 CI 1601981290 +1100 checkout: moving from master to develop -27bff1745d1ab39754071c9b225971867ea2a8a8 6573f823441ea560245f56e735d7cbc972607341 CI 1601981290 +1100 commit: second commit on develop -6573f823441ea560245f56e735d7cbc972607341 07392b739784503a325278fedf5251ecb7c3bca9 CI 1601981290 +1100 checkout: moving from develop to master -07392b739784503a325278fedf5251ecb7c3bca9 a2c097a7f46ce0bc1f1e5a17b280a574f34d4a21 CI 1601981290 +1100 commit: second commit on master -a2c097a7f46ce0bc1f1e5a17b280a574f34d4a21 6573f823441ea560245f56e735d7cbc972607341 CI 1601981290 +1100 checkout: moving from master to develop -6573f823441ea560245f56e735d7cbc972607341 de8c7134958792e1bff9b33cca090287def37f7e CI 1601981290 +1100 commit: third commit on develop -de8c7134958792e1bff9b33cca090287def37f7e a2c097a7f46ce0bc1f1e5a17b280a574f34d4a21 CI 1601981290 +1100 checkout: moving from develop to master -a2c097a7f46ce0bc1f1e5a17b280a574f34d4a21 d09f332ddbdbb1d516ca99da33b23f987e4c13c3 CI 1601981290 +1100 commit: third commit on master -d09f332ddbdbb1d516ca99da33b23f987e4c13c3 de8c7134958792e1bff9b33cca090287def37f7e CI 1601981290 +1100 checkout: moving from master to develop -de8c7134958792e1bff9b33cca090287def37f7e 149c4365ab13dfb2ef4dd1e2c1eec0f3b6be2ed9 CI 1601981290 +1100 commit: fourth commit on develop -149c4365ab13dfb2ef4dd1e2c1eec0f3b6be2ed9 d09f332ddbdbb1d516ca99da33b23f987e4c13c3 CI 1601981290 +1100 checkout: moving from develop to master -d09f332ddbdbb1d516ca99da33b23f987e4c13c3 e217a1e8fe2e038fdc59202dee120f081ecf458f CI 1601981290 +1100 commit: fourth commit on master -e217a1e8fe2e038fdc59202dee120f081ecf458f e217a1e8fe2e038fdc59202dee120f081ecf458f CI 1601981290 +1100 checkout: moving from master to base_branch -e217a1e8fe2e038fdc59202dee120f081ecf458f 8580d8908b1bfc6d71971e73812effa15c68ecf3 CI 1601981290 +1100 commit: file -8580d8908b1bfc6d71971e73812effa15c68ecf3 8580d8908b1bfc6d71971e73812effa15c68ecf3 CI 1601981290 +1100 checkout: moving from base_branch to other_branch -8580d8908b1bfc6d71971e73812effa15c68ecf3 8580d8908b1bfc6d71971e73812effa15c68ecf3 CI 1601981290 +1100 checkout: moving from other_branch to base_branch -8580d8908b1bfc6d71971e73812effa15c68ecf3 4a5f9db9c8d46ac099de054e42e17a157ee3909b CI 1601981290 +1100 commit: file changed -4a5f9db9c8d46ac099de054e42e17a157ee3909b 8580d8908b1bfc6d71971e73812effa15c68ecf3 CI 1601981290 +1100 checkout: moving from base_branch to other_branch -8580d8908b1bfc6d71971e73812effa15c68ecf3 659aa732ccda1aaa1cd6564fdb93bf0445b5115a CI 1601981293 +1100 commit: asd -659aa732ccda1aaa1cd6564fdb93bf0445b5115a ed21fe1044b8600683ec6c2abbf86195a4d55461 CI 1601981298 +1100 commit (merge): Merge branch 'base_branch' into other_branch +0000000000000000000000000000000000000000 495a8676a677db2fcd6963abc94685ab87f0f1e2 CI 1617312234 +1100 commit (initial): first commit +495a8676a677db2fcd6963abc94685ab87f0f1e2 495a8676a677db2fcd6963abc94685ab87f0f1e2 CI 1617312234 +1100 checkout: moving from master to feature/cherry-picking +495a8676a677db2fcd6963abc94685ab87f0f1e2 78d8f05867a79068cf661a3654e1e221f6fdc5d8 CI 1617312234 +1100 commit: first commit freshman year +78d8f05867a79068cf661a3654e1e221f6fdc5d8 9fe32ee7a110dbab694c978f1b03fa45f7cd7db6 CI 1617312234 +1100 commit: second commit subway eat fresh +9fe32ee7a110dbab694c978f1b03fa45f7cd7db6 9119187695a5b19287b68b0732f9142eee7dc221 CI 1617312234 +1100 commit: third commit fresh +9119187695a5b19287b68b0732f9142eee7dc221 fd64b741be226a9fe125acf45a438c089a845fea CI 1617312234 +1100 commit: fourth commit cool +fd64b741be226a9fe125acf45a438c089a845fea 47de5d2b09400df9f5252bfb02ecb0cf2702fd3e CI 1617312234 +1100 commit: fifth commit nice +47de5d2b09400df9f5252bfb02ecb0cf2702fd3e 34325b634a636cb6f7fcff24cd010405e459cf90 CI 1617312234 +1100 commit: sixth commit haha +34325b634a636cb6f7fcff24cd010405e459cf90 bcad87f16cdd4fd10adbf9a1976671bad9b0c8aa CI 1617312234 +1100 commit: seventh commit yeah +bcad87f16cdd4fd10adbf9a1976671bad9b0c8aa 7e28009fced47639d5a8b45ec229bcfcc265066a CI 1617312234 +1100 commit: eighth commit woo +7e28009fced47639d5a8b45ec229bcfcc265066a 7e28009fced47639d5a8b45ec229bcfcc265066a CI 1617312234 +1100 checkout: moving from feature/cherry-picking to develop +7e28009fced47639d5a8b45ec229bcfcc265066a ce0674441b6de3c180f4cf1ff1cdf61cf8d7aa98 CI 1617312234 +1100 commit: first commit on develop +ce0674441b6de3c180f4cf1ff1cdf61cf8d7aa98 495a8676a677db2fcd6963abc94685ab87f0f1e2 CI 1617312235 +1100 checkout: moving from develop to master +495a8676a677db2fcd6963abc94685ab87f0f1e2 4c6b27ac04033b33a0f84869ec015b6361f28f31 CI 1617312235 +1100 commit: first commit on master +4c6b27ac04033b33a0f84869ec015b6361f28f31 ce0674441b6de3c180f4cf1ff1cdf61cf8d7aa98 CI 1617312235 +1100 checkout: moving from master to develop +ce0674441b6de3c180f4cf1ff1cdf61cf8d7aa98 c21e6aeba03d5176c28b213be71d3a02e4966c87 CI 1617312235 +1100 commit: second commit on develop +c21e6aeba03d5176c28b213be71d3a02e4966c87 4c6b27ac04033b33a0f84869ec015b6361f28f31 CI 1617312235 +1100 checkout: moving from develop to master +4c6b27ac04033b33a0f84869ec015b6361f28f31 9a415e7414f26bbb93a9369576b6135e29bc7391 CI 1617312235 +1100 commit: second commit on master +9a415e7414f26bbb93a9369576b6135e29bc7391 c21e6aeba03d5176c28b213be71d3a02e4966c87 CI 1617312235 +1100 checkout: moving from master to develop +c21e6aeba03d5176c28b213be71d3a02e4966c87 2d1c52f1a9818ac62a981dbf9f7a95bd5aa0bf2e CI 1617312235 +1100 commit: third commit on develop +2d1c52f1a9818ac62a981dbf9f7a95bd5aa0bf2e 9a415e7414f26bbb93a9369576b6135e29bc7391 CI 1617312235 +1100 checkout: moving from develop to master +9a415e7414f26bbb93a9369576b6135e29bc7391 43e480c08cf3864f85bef1d5698b91786926cb58 CI 1617312235 +1100 commit: third commit on master +43e480c08cf3864f85bef1d5698b91786926cb58 2d1c52f1a9818ac62a981dbf9f7a95bd5aa0bf2e CI 1617312235 +1100 checkout: moving from master to develop +2d1c52f1a9818ac62a981dbf9f7a95bd5aa0bf2e 51c0794d2dfd4eb71cc06f5e894edd3931411057 CI 1617312235 +1100 commit: fourth commit on develop +51c0794d2dfd4eb71cc06f5e894edd3931411057 43e480c08cf3864f85bef1d5698b91786926cb58 CI 1617312235 +1100 checkout: moving from develop to master +43e480c08cf3864f85bef1d5698b91786926cb58 258864d877e7897048a0894cad34fad2a5a4c709 CI 1617312235 +1100 commit: fourth commit on master +258864d877e7897048a0894cad34fad2a5a4c709 258864d877e7897048a0894cad34fad2a5a4c709 CI 1617312235 +1100 checkout: moving from master to base_branch +258864d877e7897048a0894cad34fad2a5a4c709 5d7d612ecff0165ff92363cdf90acda30170038e CI 1617312235 +1100 commit: file +5d7d612ecff0165ff92363cdf90acda30170038e 5d7d612ecff0165ff92363cdf90acda30170038e CI 1617312235 +1100 checkout: moving from base_branch to other_branch +5d7d612ecff0165ff92363cdf90acda30170038e 5d7d612ecff0165ff92363cdf90acda30170038e CI 1617312235 +1100 checkout: moving from other_branch to base_branch +5d7d612ecff0165ff92363cdf90acda30170038e c28b32178002cb0046454f34e77f3d86391e748d CI 1617312235 +1100 commit: file changed +c28b32178002cb0046454f34e77f3d86391e748d 5d7d612ecff0165ff92363cdf90acda30170038e CI 1617312235 +1100 checkout: moving from base_branch to other_branch +5d7d612ecff0165ff92363cdf90acda30170038e e00ef3be7687b4a13bf23199fe9c01767e9b98bc CI 1617312236 +1100 commit: asd +e00ef3be7687b4a13bf23199fe9c01767e9b98bc 669e34b018f5e04940e15bd9d62465c716932039 CI 1617312262 +1100 commit (merge): Merge branch 'develop' into other_branch +669e34b018f5e04940e15bd9d62465c716932039 4ea473079cfdf1776e0d7dc114501860b8ab40c4 CI 1617312266 +1100 commit: asd diff --git a/test/integration/mergeConflicts/expected/.git_keep/logs/refs/heads/base_branch b/test/integration/mergeConflicts/expected/.git_keep/logs/refs/heads/base_branch index 383150856..1a02889c9 100644 --- a/test/integration/mergeConflicts/expected/.git_keep/logs/refs/heads/base_branch +++ b/test/integration/mergeConflicts/expected/.git_keep/logs/refs/heads/base_branch @@ -1,3 +1,3 @@ -0000000000000000000000000000000000000000 e217a1e8fe2e038fdc59202dee120f081ecf458f CI 1601981290 +1100 branch: Created from HEAD -e217a1e8fe2e038fdc59202dee120f081ecf458f 8580d8908b1bfc6d71971e73812effa15c68ecf3 CI 1601981290 +1100 commit: file -8580d8908b1bfc6d71971e73812effa15c68ecf3 4a5f9db9c8d46ac099de054e42e17a157ee3909b CI 1601981290 +1100 commit: file changed +0000000000000000000000000000000000000000 258864d877e7897048a0894cad34fad2a5a4c709 CI 1617312235 +1100 branch: Created from HEAD +258864d877e7897048a0894cad34fad2a5a4c709 5d7d612ecff0165ff92363cdf90acda30170038e CI 1617312235 +1100 commit: file +5d7d612ecff0165ff92363cdf90acda30170038e c28b32178002cb0046454f34e77f3d86391e748d CI 1617312235 +1100 commit: file changed diff --git a/test/integration/mergeConflicts/expected/.git_keep/logs/refs/heads/develop b/test/integration/mergeConflicts/expected/.git_keep/logs/refs/heads/develop index 439b9c700..0f164a9c2 100644 --- a/test/integration/mergeConflicts/expected/.git_keep/logs/refs/heads/develop +++ b/test/integration/mergeConflicts/expected/.git_keep/logs/refs/heads/develop @@ -1,5 +1,5 @@ -0000000000000000000000000000000000000000 1bbb146d9ce5c8ae1d34b7bc63fe7288adc0c26b CI 1601981290 +1100 branch: Created from HEAD -1bbb146d9ce5c8ae1d34b7bc63fe7288adc0c26b 27bff1745d1ab39754071c9b225971867ea2a8a8 CI 1601981290 +1100 commit: first commit on develop -27bff1745d1ab39754071c9b225971867ea2a8a8 6573f823441ea560245f56e735d7cbc972607341 CI 1601981290 +1100 commit: second commit on develop -6573f823441ea560245f56e735d7cbc972607341 de8c7134958792e1bff9b33cca090287def37f7e CI 1601981290 +1100 commit: third commit on develop -de8c7134958792e1bff9b33cca090287def37f7e 149c4365ab13dfb2ef4dd1e2c1eec0f3b6be2ed9 CI 1601981290 +1100 commit: fourth commit on develop +0000000000000000000000000000000000000000 7e28009fced47639d5a8b45ec229bcfcc265066a CI 1617312234 +1100 branch: Created from HEAD +7e28009fced47639d5a8b45ec229bcfcc265066a ce0674441b6de3c180f4cf1ff1cdf61cf8d7aa98 CI 1617312234 +1100 commit: first commit on develop +ce0674441b6de3c180f4cf1ff1cdf61cf8d7aa98 c21e6aeba03d5176c28b213be71d3a02e4966c87 CI 1617312235 +1100 commit: second commit on develop +c21e6aeba03d5176c28b213be71d3a02e4966c87 2d1c52f1a9818ac62a981dbf9f7a95bd5aa0bf2e CI 1617312235 +1100 commit: third commit on develop +2d1c52f1a9818ac62a981dbf9f7a95bd5aa0bf2e 51c0794d2dfd4eb71cc06f5e894edd3931411057 CI 1617312235 +1100 commit: fourth commit on develop diff --git a/test/integration/mergeConflicts/expected/.git_keep/logs/refs/heads/feature/cherry-picking b/test/integration/mergeConflicts/expected/.git_keep/logs/refs/heads/feature/cherry-picking index a61959de7..74cdfb0c9 100644 --- a/test/integration/mergeConflicts/expected/.git_keep/logs/refs/heads/feature/cherry-picking +++ b/test/integration/mergeConflicts/expected/.git_keep/logs/refs/heads/feature/cherry-picking @@ -1,9 +1,9 @@ -0000000000000000000000000000000000000000 705e4e70fae7dd1ea607b6ad0727bed681fa3de1 CI 1601981290 +1100 branch: Created from HEAD -705e4e70fae7dd1ea607b6ad0727bed681fa3de1 02caf2708fbff792572b0c30efaeddd214525c94 CI 1601981290 +1100 commit: first commit freshman year -02caf2708fbff792572b0c30efaeddd214525c94 f5794ed7a2233f8a01fea032de77d2bc6a02aaec CI 1601981290 +1100 commit: second commit subway eat fresh -f5794ed7a2233f8a01fea032de77d2bc6a02aaec 4d81feb29b83b1a26754d0f480427a13dce491f4 CI 1601981290 +1100 commit: third commit fresh -4d81feb29b83b1a26754d0f480427a13dce491f4 4e3f39dbce8ac07b560685d22d761138954a864a CI 1601981290 +1100 commit: fourth commit cool -4e3f39dbce8ac07b560685d22d761138954a864a 223a2caff009cc142bfa9b5889963a75c8004e8a CI 1601981290 +1100 commit: fifth commit nice -223a2caff009cc142bfa9b5889963a75c8004e8a b26567e4fd73c518dd6531825d81a389fa49fe03 CI 1601981290 +1100 commit: sixth commit haha -b26567e4fd73c518dd6531825d81a389fa49fe03 bfe07eeabbfcde2e7d6856918dd494c703864b20 CI 1601981290 +1100 commit: seventh commit yeah -bfe07eeabbfcde2e7d6856918dd494c703864b20 1bbb146d9ce5c8ae1d34b7bc63fe7288adc0c26b CI 1601981290 +1100 commit: eighth commit woo +0000000000000000000000000000000000000000 495a8676a677db2fcd6963abc94685ab87f0f1e2 CI 1617312234 +1100 branch: Created from HEAD +495a8676a677db2fcd6963abc94685ab87f0f1e2 78d8f05867a79068cf661a3654e1e221f6fdc5d8 CI 1617312234 +1100 commit: first commit freshman year +78d8f05867a79068cf661a3654e1e221f6fdc5d8 9fe32ee7a110dbab694c978f1b03fa45f7cd7db6 CI 1617312234 +1100 commit: second commit subway eat fresh +9fe32ee7a110dbab694c978f1b03fa45f7cd7db6 9119187695a5b19287b68b0732f9142eee7dc221 CI 1617312234 +1100 commit: third commit fresh +9119187695a5b19287b68b0732f9142eee7dc221 fd64b741be226a9fe125acf45a438c089a845fea CI 1617312234 +1100 commit: fourth commit cool +fd64b741be226a9fe125acf45a438c089a845fea 47de5d2b09400df9f5252bfb02ecb0cf2702fd3e CI 1617312234 +1100 commit: fifth commit nice +47de5d2b09400df9f5252bfb02ecb0cf2702fd3e 34325b634a636cb6f7fcff24cd010405e459cf90 CI 1617312234 +1100 commit: sixth commit haha +34325b634a636cb6f7fcff24cd010405e459cf90 bcad87f16cdd4fd10adbf9a1976671bad9b0c8aa CI 1617312234 +1100 commit: seventh commit yeah +bcad87f16cdd4fd10adbf9a1976671bad9b0c8aa 7e28009fced47639d5a8b45ec229bcfcc265066a CI 1617312234 +1100 commit: eighth commit woo diff --git a/test/integration/mergeConflicts/expected/.git_keep/logs/refs/heads/master b/test/integration/mergeConflicts/expected/.git_keep/logs/refs/heads/master index 427cc86bd..21cc73d8b 100644 --- a/test/integration/mergeConflicts/expected/.git_keep/logs/refs/heads/master +++ b/test/integration/mergeConflicts/expected/.git_keep/logs/refs/heads/master @@ -1,5 +1,5 @@ -0000000000000000000000000000000000000000 705e4e70fae7dd1ea607b6ad0727bed681fa3de1 CI 1601981290 +1100 commit (initial): first commit -705e4e70fae7dd1ea607b6ad0727bed681fa3de1 07392b739784503a325278fedf5251ecb7c3bca9 CI 1601981290 +1100 commit: first commit on master -07392b739784503a325278fedf5251ecb7c3bca9 a2c097a7f46ce0bc1f1e5a17b280a574f34d4a21 CI 1601981290 +1100 commit: second commit on master -a2c097a7f46ce0bc1f1e5a17b280a574f34d4a21 d09f332ddbdbb1d516ca99da33b23f987e4c13c3 CI 1601981290 +1100 commit: third commit on master -d09f332ddbdbb1d516ca99da33b23f987e4c13c3 e217a1e8fe2e038fdc59202dee120f081ecf458f CI 1601981290 +1100 commit: fourth commit on master +0000000000000000000000000000000000000000 495a8676a677db2fcd6963abc94685ab87f0f1e2 CI 1617312234 +1100 commit (initial): first commit +495a8676a677db2fcd6963abc94685ab87f0f1e2 4c6b27ac04033b33a0f84869ec015b6361f28f31 CI 1617312235 +1100 commit: first commit on master +4c6b27ac04033b33a0f84869ec015b6361f28f31 9a415e7414f26bbb93a9369576b6135e29bc7391 CI 1617312235 +1100 commit: second commit on master +9a415e7414f26bbb93a9369576b6135e29bc7391 43e480c08cf3864f85bef1d5698b91786926cb58 CI 1617312235 +1100 commit: third commit on master +43e480c08cf3864f85bef1d5698b91786926cb58 258864d877e7897048a0894cad34fad2a5a4c709 CI 1617312235 +1100 commit: fourth commit on master diff --git a/test/integration/mergeConflicts/expected/.git_keep/logs/refs/heads/other_branch b/test/integration/mergeConflicts/expected/.git_keep/logs/refs/heads/other_branch index 4e8ffd4f8..f3b0e8d6b 100644 --- a/test/integration/mergeConflicts/expected/.git_keep/logs/refs/heads/other_branch +++ b/test/integration/mergeConflicts/expected/.git_keep/logs/refs/heads/other_branch @@ -1,3 +1,4 @@ -0000000000000000000000000000000000000000 8580d8908b1bfc6d71971e73812effa15c68ecf3 CI 1601981290 +1100 branch: Created from HEAD -8580d8908b1bfc6d71971e73812effa15c68ecf3 659aa732ccda1aaa1cd6564fdb93bf0445b5115a CI 1601981293 +1100 commit: asd -659aa732ccda1aaa1cd6564fdb93bf0445b5115a ed21fe1044b8600683ec6c2abbf86195a4d55461 CI 1601981298 +1100 commit (merge): Merge branch 'base_branch' into other_branch +0000000000000000000000000000000000000000 5d7d612ecff0165ff92363cdf90acda30170038e CI 1617312235 +1100 branch: Created from HEAD +5d7d612ecff0165ff92363cdf90acda30170038e e00ef3be7687b4a13bf23199fe9c01767e9b98bc CI 1617312236 +1100 commit: asd +e00ef3be7687b4a13bf23199fe9c01767e9b98bc 669e34b018f5e04940e15bd9d62465c716932039 CI 1617312262 +1100 commit (merge): Merge branch 'develop' into other_branch +669e34b018f5e04940e15bd9d62465c716932039 4ea473079cfdf1776e0d7dc114501860b8ab40c4 CI 1617312266 +1100 commit: asd diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/02/caf2708fbff792572b0c30efaeddd214525c94 b/test/integration/mergeConflicts/expected/.git_keep/objects/02/caf2708fbff792572b0c30efaeddd214525c94 deleted file mode 100644 index 6a17c763e..000000000 --- a/test/integration/mergeConflicts/expected/.git_keep/objects/02/caf2708fbff792572b0c30efaeddd214525c94 +++ /dev/null @@ -1,3 +0,0 @@ -x -0=+.nZD -Jo:ĵk#+ݮU,bD}o{pu\Ь:Vy>) ԱN{$k F_mY+M3 3c#^ltjS7Z~RNh5_$PD \ No newline at end of file diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/07/392b739784503a325278fedf5251ecb7c3bca9 b/test/integration/mergeConflicts/expected/.git_keep/objects/07/392b739784503a325278fedf5251ecb7c3bca9 deleted file mode 100644 index 46101849d..000000000 Binary files a/test/integration/mergeConflicts/expected/.git_keep/objects/07/392b739784503a325278fedf5251ecb7c3bca9 and /dev/null differ diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/14/9c4365ab13dfb2ef4dd1e2c1eec0f3b6be2ed9 b/test/integration/mergeConflicts/expected/.git_keep/objects/14/9c4365ab13dfb2ef4dd1e2c1eec0f3b6be2ed9 deleted file mode 100644 index 2a5841f73..000000000 Binary files a/test/integration/mergeConflicts/expected/.git_keep/objects/14/9c4365ab13dfb2ef4dd1e2c1eec0f3b6be2ed9 and /dev/null differ diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/1b/bb146d9ce5c8ae1d34b7bc63fe7288adc0c26b b/test/integration/mergeConflicts/expected/.git_keep/objects/1b/bb146d9ce5c8ae1d34b7bc63fe7288adc0c26b deleted file mode 100644 index fe80a0056..000000000 --- a/test/integration/mergeConflicts/expected/.git_keep/objects/1b/bb146d9ce5c8ae1d34b7bc63fe7288adc0c26b +++ /dev/null @@ -1,5 +0,0 @@ -xK -0@]d&M& ]L`M)=/ܖA9M9%c5Z -UKlZ& -:REr _ &;' \ No newline at end of file diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/22/3a2caff009cc142bfa9b5889963a75c8004e8a b/test/integration/mergeConflicts/expected/.git_keep/objects/22/3a2caff009cc142bfa9b5889963a75c8004e8a deleted file mode 100644 index 749db6230..000000000 Binary files a/test/integration/mergeConflicts/expected/.git_keep/objects/22/3a2caff009cc142bfa9b5889963a75c8004e8a and /dev/null differ diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/25/8864d877e7897048a0894cad34fad2a5a4c709 b/test/integration/mergeConflicts/expected/.git_keep/objects/25/8864d877e7897048a0894cad34fad2a5a4c709 new file mode 100644 index 000000000..34d3b62c9 --- /dev/null +++ b/test/integration/mergeConflicts/expected/.git_keep/objects/25/8864d877e7897048a0894cad34fad2a5a4c709 @@ -0,0 +1,2 @@ +xM +0F]$t"#PR#x| ^{|[CDy=FI9dfrQ³Y&މ'˖XE(!&* Gi\K66]znt8 .Z=˟s~'mn@ \ No newline at end of file diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/27/bff1745d1ab39754071c9b225971867ea2a8a8 b/test/integration/mergeConflicts/expected/.git_keep/objects/27/bff1745d1ab39754071c9b225971867ea2a8a8 deleted file mode 100644 index 8ceca065f..000000000 Binary files a/test/integration/mergeConflicts/expected/.git_keep/objects/27/bff1745d1ab39754071c9b225971867ea2a8a8 and /dev/null differ diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/2d/1c52f1a9818ac62a981dbf9f7a95bd5aa0bf2e b/test/integration/mergeConflicts/expected/.git_keep/objects/2d/1c52f1a9818ac62a981dbf9f7a95bd5aa0bf2e new file mode 100644 index 000000000..88a521a36 Binary files /dev/null and b/test/integration/mergeConflicts/expected/.git_keep/objects/2d/1c52f1a9818ac62a981dbf9f7a95bd5aa0bf2e differ diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/32/d15fd4451b6693a93d6420c8af6cfc99348e71 b/test/integration/mergeConflicts/expected/.git_keep/objects/32/d15fd4451b6693a93d6420c8af6cfc99348e71 new file mode 100644 index 000000000..4a9f30d37 Binary files /dev/null and b/test/integration/mergeConflicts/expected/.git_keep/objects/32/d15fd4451b6693a93d6420c8af6cfc99348e71 differ diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/34/325b634a636cb6f7fcff24cd010405e459cf90 b/test/integration/mergeConflicts/expected/.git_keep/objects/34/325b634a636cb6f7fcff24cd010405e459cf90 new file mode 100644 index 000000000..d77ebe3af Binary files /dev/null and b/test/integration/mergeConflicts/expected/.git_keep/objects/34/325b634a636cb6f7fcff24cd010405e459cf90 differ diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/38/08a710b52a152bb73805fe274e0d877cf61800 b/test/integration/mergeConflicts/expected/.git_keep/objects/38/08a710b52a152bb73805fe274e0d877cf61800 new file mode 100644 index 000000000..74bc806ad --- /dev/null +++ b/test/integration/mergeConflicts/expected/.git_keep/objects/38/08a710b52a152bb73805fe274e0d877cf61800 @@ -0,0 +1,2 @@ +xA +0E]ATzI34)ɴMK0 |>o\a83BQ/h Eǜ}aAsjAwތ1O*B|V'5C/Q&c۬5x70| \ No newline at end of file diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/43/e480c08cf3864f85bef1d5698b91786926cb58 b/test/integration/mergeConflicts/expected/.git_keep/objects/43/e480c08cf3864f85bef1d5698b91786926cb58 new file mode 100644 index 000000000..0a877f7d8 --- /dev/null +++ b/test/integration/mergeConflicts/expected/.git_keep/objects/43/e480c08cf3864f85bef1d5698b91786926cb58 @@ -0,0 +1,2 @@ +xK +0@]$o@DǘSZ0߂pxްֺ4pOmW)˔%c1y}gR/dgAG?XJa!:.C"F#6;t=\C/Zosh91OݴyGU>f(>X \ No newline at end of file diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/47/de5d2b09400df9f5252bfb02ecb0cf2702fd3e b/test/integration/mergeConflicts/expected/.git_keep/objects/47/de5d2b09400df9f5252bfb02ecb0cf2702fd3e new file mode 100644 index 000000000..dfe80867a Binary files /dev/null and b/test/integration/mergeConflicts/expected/.git_keep/objects/47/de5d2b09400df9f5252bfb02ecb0cf2702fd3e differ diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/49/5a8676a677db2fcd6963abc94685ab87f0f1e2 b/test/integration/mergeConflicts/expected/.git_keep/objects/49/5a8676a677db2fcd6963abc94685ab87f0f1e2 new file mode 100644 index 000000000..ae02634d4 Binary files /dev/null and b/test/integration/mergeConflicts/expected/.git_keep/objects/49/5a8676a677db2fcd6963abc94685ab87f0f1e2 differ diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/4a/5f9db9c8d46ac099de054e42e17a157ee3909b b/test/integration/mergeConflicts/expected/.git_keep/objects/4a/5f9db9c8d46ac099de054e42e17a157ee3909b deleted file mode 100644 index 4a8334d3f..000000000 --- a/test/integration/mergeConflicts/expected/.git_keep/objects/4a/5f9db9c8d46ac099de054e42e17a157ee3909b +++ /dev/null @@ -1,3 +0,0 @@ -xK -0@]$ ]db C>ރ'۲ 0K;TB2'bTԘ4Uw$Tԙ=6mh9c -a$T֚*3Ӧa0>7ٖ` Z"ZkNzN5S7u~+Ȕ֗j< \ No newline at end of file diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/4c/6b27ac04033b33a0f84869ec015b6361f28f31 b/test/integration/mergeConflicts/expected/.git_keep/objects/4c/6b27ac04033b33a0f84869ec015b6361f28f31 new file mode 100644 index 000000000..6db47e52d --- /dev/null +++ b/test/integration/mergeConflicts/expected/.git_keep/objects/4c/6b27ac04033b33a0f84869ec015b6361f28f31 @@ -0,0 +1,2 @@ +xK +1D]dO09F'cLo WTK: O1͚#*O-QZ w_iu4ńK11!Y zGm0/p;OZn Z*-&1quvtYP_PA?@ \ No newline at end of file diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/4d/81feb29b83b1a26754d0f480427a13dce491f4 b/test/integration/mergeConflicts/expected/.git_keep/objects/4d/81feb29b83b1a26754d0f480427a13dce491f4 deleted file mode 100644 index 898b64dad..000000000 Binary files a/test/integration/mergeConflicts/expected/.git_keep/objects/4d/81feb29b83b1a26754d0f480427a13dce491f4 and /dev/null differ diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/4e/3f39dbce8ac07b560685d22d761138954a864a b/test/integration/mergeConflicts/expected/.git_keep/objects/4e/3f39dbce8ac07b560685d22d761138954a864a deleted file mode 100644 index d1c02f022..000000000 Binary files a/test/integration/mergeConflicts/expected/.git_keep/objects/4e/3f39dbce8ac07b560685d22d761138954a864a and /dev/null differ diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/4e/a473079cfdf1776e0d7dc114501860b8ab40c4 b/test/integration/mergeConflicts/expected/.git_keep/objects/4e/a473079cfdf1776e0d7dc114501860b8ab40c4 new file mode 100644 index 000000000..a8cba65d0 --- /dev/null +++ b/test/integration/mergeConflicts/expected/.git_keep/objects/4e/a473079cfdf1776e0d7dc114501860b8ab40c4 @@ -0,0 +1,2 @@ +xM +1 @a=E$IS\1:muw-^Yz Bb1fsckn"!Vq5oIZPɣRkl=ɟq_6MpMW>T~be#>5On\7 \ No newline at end of file diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/51/c0794d2dfd4eb71cc06f5e894edd3931411057 b/test/integration/mergeConflicts/expected/.git_keep/objects/51/c0794d2dfd4eb71cc06f5e894edd3931411057 new file mode 100644 index 000000000..1011da458 --- /dev/null +++ b/test/integration/mergeConflicts/expected/.git_keep/objects/51/c0794d2dfd4eb71cc06f5e894edd3931411057 @@ -0,0 +1,3 @@ +xA + E/hT(U1H +1oJ/XKytPޘyH2\چv=*icبF2w(;R>[&$C$CV,hKm0p;l+_b-7J ΈR:\ePkکB9 \ No newline at end of file diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/5d/7d612ecff0165ff92363cdf90acda30170038e b/test/integration/mergeConflicts/expected/.git_keep/objects/5d/7d612ecff0165ff92363cdf90acda30170038e new file mode 100644 index 000000000..7a2dae55f Binary files /dev/null and b/test/integration/mergeConflicts/expected/.git_keep/objects/5d/7d612ecff0165ff92363cdf90acda30170038e differ diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/65/73f823441ea560245f56e735d7cbc972607341 b/test/integration/mergeConflicts/expected/.git_keep/objects/65/73f823441ea560245f56e735d7cbc972607341 deleted file mode 100644 index f18991959..000000000 --- a/test/integration/mergeConflicts/expected/.git_keep/objects/65/73f823441ea560245f56e735d7cbc972607341 +++ /dev/null @@ -1,2 +0,0 @@ -xK -0@]d&Ic`Rx| ^=xM}KtVUQU%hMXy)I$*1W0q;!..c]BT8~mB?iy詶r"DfԦ橵 o}|+@ \ No newline at end of file diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/65/9aa732ccda1aaa1cd6564fdb93bf0445b5115a b/test/integration/mergeConflicts/expected/.git_keep/objects/65/9aa732ccda1aaa1cd6564fdb93bf0445b5115a deleted file mode 100644 index de26c3c61..000000000 Binary files a/test/integration/mergeConflicts/expected/.git_keep/objects/65/9aa732ccda1aaa1cd6564fdb93bf0445b5115a and /dev/null differ diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/66/9e34b018f5e04940e15bd9d62465c716932039 b/test/integration/mergeConflicts/expected/.git_keep/objects/66/9e34b018f5e04940e15bd9d62465c716932039 new file mode 100644 index 000000000..3d485ea3a Binary files /dev/null and b/test/integration/mergeConflicts/expected/.git_keep/objects/66/9e34b018f5e04940e15bd9d62465c716932039 differ diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/70/5e4e70fae7dd1ea607b6ad0727bed681fa3de1 b/test/integration/mergeConflicts/expected/.git_keep/objects/70/5e4e70fae7dd1ea607b6ad0727bed681fa3de1 deleted file mode 100644 index 7079847c8..000000000 Binary files a/test/integration/mergeConflicts/expected/.git_keep/objects/70/5e4e70fae7dd1ea607b6ad0727bed681fa3de1 and /dev/null differ diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/78/129d0f826754f2f8da7af68404daf8857d83cf b/test/integration/mergeConflicts/expected/.git_keep/objects/78/129d0f826754f2f8da7af68404daf8857d83cf new file mode 100644 index 000000000..69607a60e Binary files /dev/null and b/test/integration/mergeConflicts/expected/.git_keep/objects/78/129d0f826754f2f8da7af68404daf8857d83cf differ diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/78/d8f05867a79068cf661a3654e1e221f6fdc5d8 b/test/integration/mergeConflicts/expected/.git_keep/objects/78/d8f05867a79068cf661a3654e1e221f6fdc5d8 new file mode 100644 index 000000000..48a86e556 Binary files /dev/null and b/test/integration/mergeConflicts/expected/.git_keep/objects/78/d8f05867a79068cf661a3654e1e221f6fdc5d8 differ diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/7e/28009fced47639d5a8b45ec229bcfcc265066a b/test/integration/mergeConflicts/expected/.git_keep/objects/7e/28009fced47639d5a8b45ec229bcfcc265066a new file mode 100644 index 000000000..aa7368f74 Binary files /dev/null and b/test/integration/mergeConflicts/expected/.git_keep/objects/7e/28009fced47639d5a8b45ec229bcfcc265066a differ diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/85/80d8908b1bfc6d71971e73812effa15c68ecf3 b/test/integration/mergeConflicts/expected/.git_keep/objects/85/80d8908b1bfc6d71971e73812effa15c68ecf3 deleted file mode 100644 index d8873867d..000000000 --- a/test/integration/mergeConflicts/expected/.git_keep/objects/85/80d8908b1bfc6d71971e73812effa15c68ecf3 +++ /dev/null @@ -1,3 +0,0 @@ -xA -0Fa9ĚM3"BW=FDnuYv iZ -%%X@`$i2}?YTbt[n11B@W%P%e.}s00>M%sOlbDTß{9 \ No newline at end of file diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/86/03b3753f0207a212c71189d6154cd7a06f3f62 b/test/integration/mergeConflicts/expected/.git_keep/objects/86/03b3753f0207a212c71189d6154cd7a06f3f62 new file mode 100644 index 000000000..099aa4250 Binary files /dev/null and b/test/integration/mergeConflicts/expected/.git_keep/objects/86/03b3753f0207a212c71189d6154cd7a06f3f62 differ diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/91/19187695a5b19287b68b0732f9142eee7dc221 b/test/integration/mergeConflicts/expected/.git_keep/objects/91/19187695a5b19287b68b0732f9142eee7dc221 new file mode 100644 index 000000000..552afabd3 --- /dev/null +++ b/test/integration/mergeConflicts/expected/.git_keep/objects/91/19187695a5b19287b68b0732f9142eee7dc221 @@ -0,0 +1,3 @@ +xM +0F]$i@DL&`l</G{[-ݩ7fS +dVFQDo1[q!)%3&R SQ(MI֕^w_y' W(bϹ2,(_t@ \ No newline at end of file diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/91/65a12a95d3b2b9b8a0374de787af169b2c339e b/test/integration/mergeConflicts/expected/.git_keep/objects/91/65a12a95d3b2b9b8a0374de787af169b2c339e new file mode 100644 index 000000000..cc06d0590 Binary files /dev/null and b/test/integration/mergeConflicts/expected/.git_keep/objects/91/65a12a95d3b2b9b8a0374de787af169b2c339e differ diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/9a/415e7414f26bbb93a9369576b6135e29bc7391 b/test/integration/mergeConflicts/expected/.git_keep/objects/9a/415e7414f26bbb93a9369576b6135e29bc7391 new file mode 100644 index 000000000..1c96a4134 --- /dev/null +++ b/test/integration/mergeConflicts/expected/.git_keep/objects/9a/415e7414f26bbb93a9369576b6135e29bc7391 @@ -0,0 +1,4 @@ +xA +1 E] 409F3(ة<^_[pW3K*d"rئ/3됆{ՖA2s +IHC}\~[[a4N|A[= E&y=v۟{ + 5}2?o \ No newline at end of file diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/9f/e32ee7a110dbab694c978f1b03fa45f7cd7db6 b/test/integration/mergeConflicts/expected/.git_keep/objects/9f/e32ee7a110dbab694c978f1b03fa45f7cd7db6 new file mode 100644 index 000000000..288d56942 Binary files /dev/null and b/test/integration/mergeConflicts/expected/.git_keep/objects/9f/e32ee7a110dbab694c978f1b03fa45f7cd7db6 differ diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/a2/c097a7f46ce0bc1f1e5a17b280a574f34d4a21 b/test/integration/mergeConflicts/expected/.git_keep/objects/a2/c097a7f46ce0bc1f1e5a17b280a574f34d4a21 deleted file mode 100644 index ead50126a..000000000 --- a/test/integration/mergeConflicts/expected/.git_keep/objects/a2/c097a7f46ce0bc1f1e5a17b280a574f34d4a21 +++ /dev/null @@ -1,2 +0,0 @@ -xM -0]d&i@DHSLS߀p=R 4"v M2j- g&s*ۣ0Np|R^rZn@)LO5Wp]giPW(FQ? \ No newline at end of file diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/a4/6fe3d80027b2887996ba65853fb0591915d051 b/test/integration/mergeConflicts/expected/.git_keep/objects/a4/6fe3d80027b2887996ba65853fb0591915d051 new file mode 100644 index 000000000..a5cc1d5b4 Binary files /dev/null and b/test/integration/mergeConflicts/expected/.git_keep/objects/a4/6fe3d80027b2887996ba65853fb0591915d051 differ diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/b2/6567e4fd73c518dd6531825d81a389fa49fe03 b/test/integration/mergeConflicts/expected/.git_keep/objects/b2/6567e4fd73c518dd6531825d81a389fa49fe03 deleted file mode 100644 index daaee9023..000000000 Binary files a/test/integration/mergeConflicts/expected/.git_keep/objects/b2/6567e4fd73c518dd6531825d81a389fa49fe03 and /dev/null differ diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/bc/ad87f16cdd4fd10adbf9a1976671bad9b0c8aa b/test/integration/mergeConflicts/expected/.git_keep/objects/bc/ad87f16cdd4fd10adbf9a1976671bad9b0c8aa new file mode 100644 index 000000000..3cf1dac98 --- /dev/null +++ b/test/integration/mergeConflicts/expected/.git_keep/objects/bc/ad87f16cdd4fd10adbf9a1976671bad9b0c8aa @@ -0,0 +1,3 @@ +xK +0@]d&_"BW=$PR-x幵k~W(} ٹV"U.:93RRb4jU5%o,{s5\ E'\#*~i^a4ys[nrs;y +6DjT?u2𤾸> \ No newline at end of file diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/bf/e07eeabbfcde2e7d6856918dd494c703864b20 b/test/integration/mergeConflicts/expected/.git_keep/objects/bf/e07eeabbfcde2e7d6856918dd494c703864b20 deleted file mode 100644 index 7b80aff0d..000000000 --- a/test/integration/mergeConflicts/expected/.git_keep/objects/bf/e07eeabbfcde2e7d6856918dd494c703864b20 +++ /dev/null @@ -1,4 +0,0 @@ -xK -0@]d&i~ "t1&Ʉ -ƖEoo }/ϭ];ht@Ak<&$RSHKѨWwHYeśl)⬡m &CFO -,onMyn' 鈰'BTݦ ~|' > \ No newline at end of file diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/c2/1e6aeba03d5176c28b213be71d3a02e4966c87 b/test/integration/mergeConflicts/expected/.git_keep/objects/c2/1e6aeba03d5176c28b213be71d3a02e4966c87 new file mode 100644 index 000000000..518fc5977 Binary files /dev/null and b/test/integration/mergeConflicts/expected/.git_keep/objects/c2/1e6aeba03d5176c28b213be71d3a02e4966c87 differ diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/c2/8b32178002cb0046454f34e77f3d86391e748d b/test/integration/mergeConflicts/expected/.git_keep/objects/c2/8b32178002cb0046454f34e77f3d86391e748d new file mode 100644 index 000000000..161eb926a --- /dev/null +++ b/test/integration/mergeConflicts/expected/.git_keep/objects/c2/8b32178002cb0046454f34e77f3d86391e748d @@ -0,0 +1,2 @@ +xK +0a95 ]d#?o27/ŐƎQXeEF QGLU!kX&tªST'U-\HNLi;Oeˍ<:#\5g=ɍoj~< \ No newline at end of file diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/ce/0674441b6de3c180f4cf1ff1cdf61cf8d7aa98 b/test/integration/mergeConflicts/expected/.git_keep/objects/ce/0674441b6de3c180f4cf1ff1cdf61cf8d7aa98 new file mode 100644 index 000000000..dfd30d889 Binary files /dev/null and b/test/integration/mergeConflicts/expected/.git_keep/objects/ce/0674441b6de3c180f4cf1ff1cdf61cf8d7aa98 differ diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/d0/9f332ddbdbb1d516ca99da33b23f987e4c13c3 b/test/integration/mergeConflicts/expected/.git_keep/objects/d0/9f332ddbdbb1d516ca99da33b23f987e4c13c3 deleted file mode 100644 index 6955a6f9c..000000000 --- a/test/integration/mergeConflicts/expected/.git_keep/objects/d0/9f332ddbdbb1d516ca99da33b23f987e4c13c3 +++ /dev/null @@ -1,4 +0,0 @@ -xM -0a9@DǘZ0߂p>ֵtM4%84D]DO6\MXgLC> N -c -.bƚ5F]>\\Vo@)E L8\em3lO:-?/ \ No newline at end of file diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/dc/51702c869f97b9ae4e236dc7684c55816fd99a b/test/integration/mergeConflicts/expected/.git_keep/objects/dc/51702c869f97b9ae4e236dc7684c55816fd99a deleted file mode 100644 index 4cf840395..000000000 Binary files a/test/integration/mergeConflicts/expected/.git_keep/objects/dc/51702c869f97b9ae4e236dc7684c55816fd99a and /dev/null differ diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/de/8c7134958792e1bff9b33cca090287def37f7e b/test/integration/mergeConflicts/expected/.git_keep/objects/de/8c7134958792e1bff9b33cca090287def37f7e deleted file mode 100644 index a80770449..000000000 --- a/test/integration/mergeConflicts/expected/.git_keep/objects/de/8c7134958792e1bff9b33cca090287def37f7e +++ /dev/null @@ -1,2 +0,0 @@ -xK -0@]d&i@DH)-M Q</Tmi /@p!s$̑))HlGьv2XeoZ \ No newline at end of file diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/e0/0ef3be7687b4a13bf23199fe9c01767e9b98bc b/test/integration/mergeConflicts/expected/.git_keep/objects/e0/0ef3be7687b4a13bf23199fe9c01767e9b98bc new file mode 100644 index 000000000..e8895a84c Binary files /dev/null and b/test/integration/mergeConflicts/expected/.git_keep/objects/e0/0ef3be7687b4a13bf23199fe9c01767e9b98bc differ diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/e2/17a1e8fe2e038fdc59202dee120f081ecf458f b/test/integration/mergeConflicts/expected/.git_keep/objects/e2/17a1e8fe2e038fdc59202dee120f081ecf458f deleted file mode 100644 index 3ed017b56..000000000 Binary files a/test/integration/mergeConflicts/expected/.git_keep/objects/e2/17a1e8fe2e038fdc59202dee120f081ecf458f and /dev/null differ diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/ed/21fe1044b8600683ec6c2abbf86195a4d55461 b/test/integration/mergeConflicts/expected/.git_keep/objects/ed/21fe1044b8600683ec6c2abbf86195a4d55461 deleted file mode 100644 index 767d40cea..000000000 --- a/test/integration/mergeConflicts/expected/.git_keep/objects/ed/21fe1044b8600683ec6c2abbf86195a4d55461 +++ /dev/null @@ -1 +0,0 @@ -xAJ1E])j7 AR$"¬fRvg< mmwAŐ*Ѣ(iel!Inm"US% !+.%$Q\``$I>:/x<ۗlw{ж=&zD >X3]v]^ hjM߻V \ No newline at end of file diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/f5/794ed7a2233f8a01fea032de77d2bc6a02aaec b/test/integration/mergeConflicts/expected/.git_keep/objects/f5/794ed7a2233f8a01fea032de77d2bc6a02aaec deleted file mode 100644 index e829884f3..000000000 --- a/test/integration/mergeConflicts/expected/.git_keep/objects/f5/794ed7a2233f8a01fea032de77d2bc6a02aaec +++ /dev/null @@ -1,2 +0,0 @@ -xA -0E]d2&M"BW=$P~{Xހ;*7)9'x2U "gr琳dg̒R"m,ٽxkS0pƛy^reP^G8ju?O\3Ou /p\eP9B \ No newline at end of file diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/fd/64b741be226a9fe125acf45a438c089a845fea b/test/integration/mergeConflicts/expected/.git_keep/objects/fd/64b741be226a9fe125acf45a438c089a845fea new file mode 100644 index 000000000..422081a4d Binary files /dev/null and b/test/integration/mergeConflicts/expected/.git_keep/objects/fd/64b741be226a9fe125acf45a438c089a845fea differ diff --git a/test/integration/mergeConflicts/expected/.git_keep/refs/heads/base_branch b/test/integration/mergeConflicts/expected/.git_keep/refs/heads/base_branch index 11226b7e8..0babb4c93 100644 --- a/test/integration/mergeConflicts/expected/.git_keep/refs/heads/base_branch +++ b/test/integration/mergeConflicts/expected/.git_keep/refs/heads/base_branch @@ -1 +1 @@ -4a5f9db9c8d46ac099de054e42e17a157ee3909b +c28b32178002cb0046454f34e77f3d86391e748d diff --git a/test/integration/mergeConflicts/expected/.git_keep/refs/heads/develop b/test/integration/mergeConflicts/expected/.git_keep/refs/heads/develop index 78c028d95..88a6f88c5 100644 --- a/test/integration/mergeConflicts/expected/.git_keep/refs/heads/develop +++ b/test/integration/mergeConflicts/expected/.git_keep/refs/heads/develop @@ -1 +1 @@ -149c4365ab13dfb2ef4dd1e2c1eec0f3b6be2ed9 +51c0794d2dfd4eb71cc06f5e894edd3931411057 diff --git a/test/integration/mergeConflicts/expected/.git_keep/refs/heads/feature/cherry-picking b/test/integration/mergeConflicts/expected/.git_keep/refs/heads/feature/cherry-picking index d255de7e2..d42443ba1 100644 --- a/test/integration/mergeConflicts/expected/.git_keep/refs/heads/feature/cherry-picking +++ b/test/integration/mergeConflicts/expected/.git_keep/refs/heads/feature/cherry-picking @@ -1 +1 @@ -1bbb146d9ce5c8ae1d34b7bc63fe7288adc0c26b +7e28009fced47639d5a8b45ec229bcfcc265066a diff --git a/test/integration/mergeConflicts/expected/.git_keep/refs/heads/master b/test/integration/mergeConflicts/expected/.git_keep/refs/heads/master index 29c7a8be1..998aceb22 100644 --- a/test/integration/mergeConflicts/expected/.git_keep/refs/heads/master +++ b/test/integration/mergeConflicts/expected/.git_keep/refs/heads/master @@ -1 +1 @@ -e217a1e8fe2e038fdc59202dee120f081ecf458f +258864d877e7897048a0894cad34fad2a5a4c709 diff --git a/test/integration/mergeConflicts/expected/.git_keep/refs/heads/other_branch b/test/integration/mergeConflicts/expected/.git_keep/refs/heads/other_branch index 13d445aa4..3c950a997 100644 --- a/test/integration/mergeConflicts/expected/.git_keep/refs/heads/other_branch +++ b/test/integration/mergeConflicts/expected/.git_keep/refs/heads/other_branch @@ -1 +1 @@ -ed21fe1044b8600683ec6c2abbf86195a4d55461 +4ea473079cfdf1776e0d7dc114501860b8ab40c4 diff --git a/test/integration/mergeConflicts/expected/cherrypicking1 b/test/integration/mergeConflicts/expected/cherrypicking1 new file mode 100644 index 000000000..6101e9354 --- /dev/null +++ b/test/integration/mergeConflicts/expected/cherrypicking1 @@ -0,0 +1 @@ +this is file number 1 that I'm going to cherry-pick diff --git a/test/integration/mergeConflicts/expected/cherrypicking2 b/test/integration/mergeConflicts/expected/cherrypicking2 new file mode 100644 index 000000000..889b0fdfe --- /dev/null +++ b/test/integration/mergeConflicts/expected/cherrypicking2 @@ -0,0 +1 @@ +this is file number 2 that I'm going to cherry-pick diff --git a/test/integration/mergeConflicts/expected/cherrypicking3 b/test/integration/mergeConflicts/expected/cherrypicking3 new file mode 100644 index 000000000..eb90e8d7b --- /dev/null +++ b/test/integration/mergeConflicts/expected/cherrypicking3 @@ -0,0 +1 @@ +this is file number 3 that I'm going to cherry-pick diff --git a/test/integration/mergeConflicts/expected/cherrypicking4 b/test/integration/mergeConflicts/expected/cherrypicking4 new file mode 100644 index 000000000..b4121e2d6 --- /dev/null +++ b/test/integration/mergeConflicts/expected/cherrypicking4 @@ -0,0 +1 @@ +this is file number 4 that I'm going to cherry-pick diff --git a/test/integration/mergeConflicts/expected/cherrypicking5 b/test/integration/mergeConflicts/expected/cherrypicking5 new file mode 100644 index 000000000..afa76754c --- /dev/null +++ b/test/integration/mergeConflicts/expected/cherrypicking5 @@ -0,0 +1 @@ +this is file number 5 that I'm going to cherry-pick diff --git a/test/integration/mergeConflicts/expected/cherrypicking6 b/test/integration/mergeConflicts/expected/cherrypicking6 new file mode 100644 index 000000000..18f469bc7 --- /dev/null +++ b/test/integration/mergeConflicts/expected/cherrypicking6 @@ -0,0 +1 @@ +this is file number 6 that I'm going to cherry-pick diff --git a/test/integration/mergeConflicts/expected/cherrypicking7 b/test/integration/mergeConflicts/expected/cherrypicking7 new file mode 100644 index 000000000..e448ae5bf --- /dev/null +++ b/test/integration/mergeConflicts/expected/cherrypicking7 @@ -0,0 +1 @@ +this is file number 7 that I'm going to cherry-pick diff --git a/test/integration/mergeConflicts/expected/cherrypicking8 b/test/integration/mergeConflicts/expected/cherrypicking8 new file mode 100644 index 000000000..90a84fd62 --- /dev/null +++ b/test/integration/mergeConflicts/expected/cherrypicking8 @@ -0,0 +1 @@ +this is file number 8 that I'm going to cherry-pick diff --git a/test/integration/mergeConflicts/expected/cherrypicking9 b/test/integration/mergeConflicts/expected/cherrypicking9 new file mode 100644 index 000000000..22b0fd807 --- /dev/null +++ b/test/integration/mergeConflicts/expected/cherrypicking9 @@ -0,0 +1 @@ +this is file number 9 that I'm going to cherry-pick diff --git a/test/integration/mergeConflicts/expected/directory/file b/test/integration/mergeConflicts/expected/directory/file index df6b0d2bc..180cf8328 100644 --- a/test/integration/mergeConflicts/expected/directory/file +++ b/test/integration/mergeConflicts/expected/directory/file @@ -1 +1 @@ -test3 +test2 diff --git a/test/integration/mergeConflicts/expected/directory/file2 b/test/integration/mergeConflicts/expected/directory/file2 index df6b0d2bc..180cf8328 100644 --- a/test/integration/mergeConflicts/expected/directory/file2 +++ b/test/integration/mergeConflicts/expected/directory/file2 @@ -1 +1 @@ -test3 +test2 diff --git a/test/integration/mergeConflicts/expected/file b/test/integration/mergeConflicts/expected/file index 173a40ed5..2410ee12b 100644 --- a/test/integration/mergeConflicts/expected/file +++ b/test/integration/mergeConflicts/expected/file @@ -1 +1 @@ -new1\noriginal2\noriginal3 +new2\noriginal2\noriginal3 diff --git a/test/integration/mergeConflicts/expected/file3 b/test/integration/mergeConflicts/expected/file3 index e3ae5c6d8..1b9ae5f5d 100644 --- a/test/integration/mergeConflicts/expected/file3 +++ b/test/integration/mergeConflicts/expected/file3 @@ -1 +1 @@ -once upon a time there was a horse +once upon a time there was a mouse diff --git a/test/integration/mergeConflicts/expected/file5 b/test/integration/mergeConflicts/expected/file5 index e3ae5c6d8..8603b3753 100644 --- a/test/integration/mergeConflicts/expected/file5 +++ b/test/integration/mergeConflicts/expected/file5 @@ -1 +1,2 @@ once upon a time there was a horse +once upon a time there was a mouse diff --git a/test/integration/mergeConflicts/recording.json b/test/integration/mergeConflicts/recording.json index 1ee1b28e8..a1538ecc8 100644 --- a/test/integration/mergeConflicts/recording.json +++ b/test/integration/mergeConflicts/recording.json @@ -1 +1 @@ -[{"Timestamp":16,"Event":{"Type":1,"Mod":0,"Key":0,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":0,"Bytes":null}},{"Timestamp":565,"Event":{"Type":0,"Mod":0,"Key":0,"Ch":99,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"Yw=="}},{"Timestamp":1029,"Event":{"Type":0,"Mod":0,"Key":13,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"DQ=="}},{"Timestamp":1509,"Event":{"Type":0,"Mod":0,"Key":0,"Ch":97,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"YQ=="}},{"Timestamp":1573,"Event":{"Type":0,"Mod":0,"Key":0,"Ch":115,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"cw=="}},{"Timestamp":1613,"Event":{"Type":0,"Mod":0,"Key":0,"Ch":100,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"ZA=="}},{"Timestamp":1868,"Event":{"Type":0,"Mod":0,"Key":13,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"DQ=="}},{"Timestamp":2413,"Event":{"Type":0,"Mod":0,"Key":65514,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09D"}},{"Timestamp":2708,"Event":{"Type":0,"Mod":0,"Key":65516,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09C"}},{"Timestamp":3357,"Event":{"Type":0,"Mod":0,"Key":0,"Ch":77,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"TQ=="}},{"Timestamp":3757,"Event":{"Type":0,"Mod":0,"Key":13,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"DQ=="}},{"Timestamp":4509,"Event":{"Type":0,"Mod":0,"Key":13,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"DQ=="}},{"Timestamp":5045,"Event":{"Type":0,"Mod":0,"Key":13,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"DQ=="}},{"Timestamp":5356,"Event":{"Type":0,"Mod":0,"Key":65516,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09C"}},{"Timestamp":5677,"Event":{"Type":0,"Mod":0,"Key":32,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"IA=="}},{"Timestamp":6365,"Event":{"Type":0,"Mod":0,"Key":13,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"DQ=="}},{"Timestamp":7029,"Event":{"Type":0,"Mod":0,"Key":0,"Ch":113,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"cQ=="}}] \ No newline at end of file +[{"Timestamp":12,"Event":{"Type":1,"Mod":0,"Key":0,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":0,"Bytes":null}},{"Timestamp":457,"Event":{"Type":0,"Mod":0,"Key":32,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"IA=="}},{"Timestamp":577,"Event":{"Type":0,"Mod":0,"Key":0,"Ch":99,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"Yw=="}},{"Timestamp":744,"Event":{"Type":0,"Mod":0,"Key":0,"Ch":97,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"YQ=="}},{"Timestamp":872,"Event":{"Type":0,"Mod":0,"Key":0,"Ch":115,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"cw=="}},{"Timestamp":937,"Event":{"Type":0,"Mod":0,"Key":0,"Ch":100,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"ZA=="}},{"Timestamp":1049,"Event":{"Type":0,"Mod":0,"Key":13,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"DQ=="}},{"Timestamp":1442,"Event":{"Type":0,"Mod":0,"Key":65514,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09D"}},{"Timestamp":1704,"Event":{"Type":0,"Mod":0,"Key":65516,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09C"}},{"Timestamp":1832,"Event":{"Type":0,"Mod":0,"Key":65516,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09C"}},{"Timestamp":1936,"Event":{"Type":0,"Mod":0,"Key":65516,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09C"}},{"Timestamp":2425,"Event":{"Type":0,"Mod":0,"Key":0,"Ch":77,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"TQ=="}},{"Timestamp":2697,"Event":{"Type":0,"Mod":0,"Key":13,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"DQ=="}},{"Timestamp":3272,"Event":{"Type":0,"Mod":0,"Key":13,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"DQ=="}},{"Timestamp":3634,"Event":{"Type":0,"Mod":0,"Key":65516,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09C"}},{"Timestamp":4177,"Event":{"Type":0,"Mod":0,"Key":32,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"IA=="}},{"Timestamp":4696,"Event":{"Type":0,"Mod":0,"Key":65516,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09C"}},{"Timestamp":4985,"Event":{"Type":0,"Mod":0,"Key":32,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"IA=="}},{"Timestamp":5777,"Event":{"Type":0,"Mod":0,"Key":65516,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09C"}},{"Timestamp":5905,"Event":{"Type":0,"Mod":0,"Key":65516,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09C"}},{"Timestamp":6113,"Event":{"Type":0,"Mod":0,"Key":32,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"IA=="}},{"Timestamp":6937,"Event":{"Type":0,"Mod":0,"Key":65516,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09C"}},{"Timestamp":7353,"Event":{"Type":0,"Mod":0,"Key":65517,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09B"}},{"Timestamp":7577,"Event":{"Type":0,"Mod":0,"Key":32,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"IA=="}},{"Timestamp":8737,"Event":{"Type":0,"Mod":0,"Key":0,"Ch":96,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"YA=="}},{"Timestamp":9409,"Event":{"Type":0,"Mod":0,"Key":65517,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09B"}},{"Timestamp":9743,"Event":{"Type":0,"Mod":0,"Key":65517,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09B"}},{"Timestamp":9759,"Event":{"Type":0,"Mod":0,"Key":65517,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09B"}},{"Timestamp":9775,"Event":{"Type":0,"Mod":0,"Key":65517,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09B"}},{"Timestamp":9792,"Event":{"Type":0,"Mod":0,"Key":65517,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09B"}},{"Timestamp":9809,"Event":{"Type":0,"Mod":0,"Key":65517,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09B"}},{"Timestamp":9826,"Event":{"Type":0,"Mod":0,"Key":65517,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09B"}},{"Timestamp":9844,"Event":{"Type":0,"Mod":0,"Key":65517,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09B"}},{"Timestamp":9859,"Event":{"Type":0,"Mod":0,"Key":65517,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09B"}},{"Timestamp":9877,"Event":{"Type":0,"Mod":0,"Key":65517,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09B"}},{"Timestamp":9894,"Event":{"Type":0,"Mod":0,"Key":65517,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09B"}},{"Timestamp":9910,"Event":{"Type":0,"Mod":0,"Key":65517,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09B"}},{"Timestamp":9928,"Event":{"Type":0,"Mod":0,"Key":65517,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09B"}},{"Timestamp":9944,"Event":{"Type":0,"Mod":0,"Key":65517,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09B"}},{"Timestamp":9960,"Event":{"Type":0,"Mod":0,"Key":65517,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09B"}},{"Timestamp":9977,"Event":{"Type":0,"Mod":0,"Key":65517,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09B"}},{"Timestamp":9995,"Event":{"Type":0,"Mod":0,"Key":65517,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09B"}},{"Timestamp":10010,"Event":{"Type":0,"Mod":0,"Key":65517,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09B"}},{"Timestamp":10027,"Event":{"Type":0,"Mod":0,"Key":65517,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09B"}},{"Timestamp":10044,"Event":{"Type":0,"Mod":0,"Key":65517,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09B"}},{"Timestamp":10061,"Event":{"Type":0,"Mod":0,"Key":65517,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09B"}},{"Timestamp":10077,"Event":{"Type":0,"Mod":0,"Key":65517,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09B"}},{"Timestamp":10094,"Event":{"Type":0,"Mod":0,"Key":65517,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09B"}},{"Timestamp":10111,"Event":{"Type":0,"Mod":0,"Key":65517,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09B"}},{"Timestamp":10127,"Event":{"Type":0,"Mod":0,"Key":65517,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09B"}},{"Timestamp":10144,"Event":{"Type":0,"Mod":0,"Key":65517,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09B"}},{"Timestamp":10161,"Event":{"Type":0,"Mod":0,"Key":65517,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09B"}},{"Timestamp":10178,"Event":{"Type":0,"Mod":0,"Key":65517,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09B"}},{"Timestamp":10195,"Event":{"Type":0,"Mod":0,"Key":65517,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09B"}},{"Timestamp":10345,"Event":{"Type":0,"Mod":0,"Key":65516,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09C"}},{"Timestamp":10817,"Event":{"Type":0,"Mod":0,"Key":65516,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09C"}},{"Timestamp":11240,"Event":{"Type":0,"Mod":0,"Key":13,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"DQ=="}},{"Timestamp":12230,"Event":{"Type":0,"Mod":0,"Key":27,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"Gw=="}},{"Timestamp":12497,"Event":{"Type":0,"Mod":0,"Key":32,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"IA=="}},{"Timestamp":13808,"Event":{"Type":0,"Mod":0,"Key":65517,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09B"}},{"Timestamp":14145,"Event":{"Type":0,"Mod":0,"Key":32,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"IA=="}},{"Timestamp":14505,"Event":{"Type":0,"Mod":0,"Key":65516,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09C"}},{"Timestamp":14760,"Event":{"Type":0,"Mod":0,"Key":32,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"IA=="}},{"Timestamp":15369,"Event":{"Type":0,"Mod":0,"Key":65516,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09C"}},{"Timestamp":15970,"Event":{"Type":0,"Mod":0,"Key":65517,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09B"}},{"Timestamp":16233,"Event":{"Type":0,"Mod":0,"Key":32,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"IA=="}},{"Timestamp":16825,"Event":{"Type":0,"Mod":0,"Key":65516,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09C"}},{"Timestamp":17159,"Event":{"Type":0,"Mod":0,"Key":65516,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09C"}},{"Timestamp":17175,"Event":{"Type":0,"Mod":0,"Key":65516,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09C"}},{"Timestamp":17191,"Event":{"Type":0,"Mod":0,"Key":65516,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09C"}},{"Timestamp":17208,"Event":{"Type":0,"Mod":0,"Key":65516,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09C"}},{"Timestamp":17224,"Event":{"Type":0,"Mod":0,"Key":65516,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09C"}},{"Timestamp":17240,"Event":{"Type":0,"Mod":0,"Key":65516,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09C"}},{"Timestamp":17257,"Event":{"Type":0,"Mod":0,"Key":65516,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09C"}},{"Timestamp":17274,"Event":{"Type":0,"Mod":0,"Key":65516,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09C"}},{"Timestamp":17290,"Event":{"Type":0,"Mod":0,"Key":65516,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09C"}},{"Timestamp":17307,"Event":{"Type":0,"Mod":0,"Key":65516,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09C"}},{"Timestamp":18073,"Event":{"Type":0,"Mod":0,"Key":32,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"IA=="}},{"Timestamp":18689,"Event":{"Type":0,"Mod":0,"Key":65517,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09B"}},{"Timestamp":19337,"Event":{"Type":0,"Mod":0,"Key":65514,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09D"}},{"Timestamp":19841,"Event":{"Type":0,"Mod":0,"Key":32,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"IA=="}},{"Timestamp":20725,"Event":{"Type":0,"Mod":0,"Key":27,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"Gw=="}},{"Timestamp":20977,"Event":{"Type":0,"Mod":0,"Key":0,"Ch":96,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"YA=="}},{"Timestamp":21545,"Event":{"Type":0,"Mod":0,"Key":65516,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09C"}},{"Timestamp":21904,"Event":{"Type":0,"Mod":0,"Key":65517,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09B"}},{"Timestamp":22377,"Event":{"Type":0,"Mod":0,"Key":13,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"DQ=="}},{"Timestamp":22705,"Event":{"Type":0,"Mod":0,"Key":32,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"IA=="}},{"Timestamp":23625,"Event":{"Type":0,"Mod":0,"Key":32,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"IA=="}},{"Timestamp":24057,"Event":{"Type":0,"Mod":0,"Key":13,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"DQ=="}},{"Timestamp":24345,"Event":{"Type":0,"Mod":0,"Key":65516,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09C"}},{"Timestamp":24601,"Event":{"Type":0,"Mod":0,"Key":32,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"IA=="}},{"Timestamp":25121,"Event":{"Type":0,"Mod":0,"Key":32,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"IA=="}},{"Timestamp":26113,"Event":{"Type":0,"Mod":0,"Key":0,"Ch":98,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"Yg=="}},{"Timestamp":27209,"Event":{"Type":0,"Mod":0,"Key":13,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"DQ=="}},{"Timestamp":28761,"Event":{"Type":0,"Mod":0,"Key":65516,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09C"}},{"Timestamp":29905,"Event":{"Type":0,"Mod":0,"Key":0,"Ch":99,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"Yw=="}},{"Timestamp":30137,"Event":{"Type":0,"Mod":0,"Key":0,"Ch":97,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"YQ=="}},{"Timestamp":30177,"Event":{"Type":0,"Mod":0,"Key":0,"Ch":115,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"cw=="}},{"Timestamp":30225,"Event":{"Type":0,"Mod":0,"Key":0,"Ch":100,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"ZA=="}},{"Timestamp":30465,"Event":{"Type":0,"Mod":0,"Key":13,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"DQ=="}},{"Timestamp":30657,"Event":{"Type":0,"Mod":0,"Key":0,"Ch":97,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"YQ=="}},{"Timestamp":30680,"Event":{"Type":0,"Mod":0,"Key":0,"Ch":115,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"cw=="}},{"Timestamp":30721,"Event":{"Type":0,"Mod":0,"Key":0,"Ch":100,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"ZA=="}},{"Timestamp":30849,"Event":{"Type":0,"Mod":0,"Key":13,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"DQ=="}},{"Timestamp":31601,"Event":{"Type":0,"Mod":0,"Key":0,"Ch":113,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"cQ=="}}] \ No newline at end of file diff --git a/test/integration/mergeConflicts/test.json b/test/integration/mergeConflicts/test.json index 41e095612..fae2b759a 100644 --- a/test/integration/mergeConflicts/test.json +++ b/test/integration/mergeConflicts/test.json @@ -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 }