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

update merge conflict test

Browse Source
This commit is contained in:
Jesse Duffield 2021-04-05 11:26:31 +10:00
parent 3c20425649
commit f08f248cb7
69 changed files with 143 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1 +1,36 @@
asd Merge branch 'develop' into other_branch
# Conflicts:
# directory/file
# directory/file2
# file1
# file3
# file4
# file5
#
# It looks like you may be committing a merge.
# If this is not correct, please remove the file
# /Users/jesseduffieldduffield/go/src/github.com/jesseduffield/lazygit/test/integration/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:
# new file: cherrypicking1
# new file: cherrypicking2
# new file: cherrypicking3
# new file: cherrypicking4
# new file: cherrypicking5
# new file: cherrypicking6
# new file: cherrypicking7
# new file: cherrypicking8
# new file: cherrypicking9
# modified: file1
# modified: file4
# modified: file5
#

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

@ -1 +1 @@
e00ef3be7687b4a13bf23199fe9c01767e9b98bc 1dd0692a163379d160e23ac52509d909b41b0a35

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,35 +1,34 @@
0000000000000000000000000000000000000000 495a8676a677db2fcd6963abc94685ab87f0f1e2 CI <CI@example.com> 1617312234 +1100 commit (initial): first commit 0000000000000000000000000000000000000000 c5507059e2aa65bc2dad65bd38b879079b69c48c CI <CI@example.com> 1617586185 +1000 commit (initial): first commit
495a8676a677db2fcd6963abc94685ab87f0f1e2 495a8676a677db2fcd6963abc94685ab87f0f1e2 CI <CI@example.com> 1617312234 +1100 checkout: moving from master to feature/cherry-picking c5507059e2aa65bc2dad65bd38b879079b69c48c c5507059e2aa65bc2dad65bd38b879079b69c48c CI <CI@example.com> 1617586185 +1000 checkout: moving from master to feature/cherry-picking
495a8676a677db2fcd6963abc94685ab87f0f1e2 78d8f05867a79068cf661a3654e1e221f6fdc5d8 CI <CI@example.com> 1617312234 +1100 commit: first commit freshman year c5507059e2aa65bc2dad65bd38b879079b69c48c 54757435deaedf649b36b12188bc8a5e3ea6a833 CI <CI@example.com> 1617586185 +1000 commit: first commit freshman year
78d8f05867a79068cf661a3654e1e221f6fdc5d8 9fe32ee7a110dbab694c978f1b03fa45f7cd7db6 CI <CI@example.com> 1617312234 +1100 commit: second commit subway eat fresh 54757435deaedf649b36b12188bc8a5e3ea6a833 5e3a33cb09434849f7bbabaaad8386c9f0508eec CI <CI@example.com> 1617586185 +1000 commit: second commit subway eat fresh
9fe32ee7a110dbab694c978f1b03fa45f7cd7db6 9119187695a5b19287b68b0732f9142eee7dc221 CI <CI@example.com> 1617312234 +1100 commit: third commit fresh 5e3a33cb09434849f7bbabaaad8386c9f0508eec a42af37388a9ad2eac85f71828cfc63262c90900 CI <CI@example.com> 1617586185 +1000 commit: third commit fresh
9119187695a5b19287b68b0732f9142eee7dc221 fd64b741be226a9fe125acf45a438c089a845fea CI <CI@example.com> 1617312234 +1100 commit: fourth commit cool a42af37388a9ad2eac85f71828cfc63262c90900 174226770a9dfeb661c9818c920568703c27c480 CI <CI@example.com> 1617586185 +1000 commit: fourth commit cool
fd64b741be226a9fe125acf45a438c089a845fea 47de5d2b09400df9f5252bfb02ecb0cf2702fd3e CI <CI@example.com> 1617312234 +1100 commit: fifth commit nice 174226770a9dfeb661c9818c920568703c27c480 eeb8990921f62a1ec3fc0be960c8068a24503ca8 CI <CI@example.com> 1617586185 +1000 commit: fifth commit nice
47de5d2b09400df9f5252bfb02ecb0cf2702fd3e 34325b634a636cb6f7fcff24cd010405e459cf90 CI <CI@example.com> 1617312234 +1100 commit: sixth commit haha eeb8990921f62a1ec3fc0be960c8068a24503ca8 00dc25bdd47993a880597e0680039d04a4d3328d CI <CI@example.com> 1617586185 +1000 commit: sixth commit haha
34325b634a636cb6f7fcff24cd010405e459cf90 bcad87f16cdd4fd10adbf9a1976671bad9b0c8aa CI <CI@example.com> 1617312234 +1100 commit: seventh commit yeah 00dc25bdd47993a880597e0680039d04a4d3328d fbd2d93aec237d4e44e44f3647067972c3fa69f5 CI <CI@example.com> 1617586185 +1000 commit: seventh commit yeah
bcad87f16cdd4fd10adbf9a1976671bad9b0c8aa 7e28009fced47639d5a8b45ec229bcfcc265066a CI <CI@example.com> 1617312234 +1100 commit: eighth commit woo fbd2d93aec237d4e44e44f3647067972c3fa69f5 f05cdc6bb7f98285583770bec5a8d307a7805bd6 CI <CI@example.com> 1617586185 +1000 commit: eighth commit woo
7e28009fced47639d5a8b45ec229bcfcc265066a 7e28009fced47639d5a8b45ec229bcfcc265066a CI <CI@example.com> 1617312234 +1100 checkout: moving from feature/cherry-picking to develop f05cdc6bb7f98285583770bec5a8d307a7805bd6 f05cdc6bb7f98285583770bec5a8d307a7805bd6 CI <CI@example.com> 1617586185 +1000 checkout: moving from feature/cherry-picking to develop
7e28009fced47639d5a8b45ec229bcfcc265066a ce0674441b6de3c180f4cf1ff1cdf61cf8d7aa98 CI <CI@example.com> 1617312234 +1100 commit: first commit on develop f05cdc6bb7f98285583770bec5a8d307a7805bd6 417a3f75c440e565dab9b5afa78747ef37446348 CI <CI@example.com> 1617586185 +1000 commit: first commit on develop
ce0674441b6de3c180f4cf1ff1cdf61cf8d7aa98 495a8676a677db2fcd6963abc94685ab87f0f1e2 CI <CI@example.com> 1617312235 +1100 checkout: moving from develop to master 417a3f75c440e565dab9b5afa78747ef37446348 c5507059e2aa65bc2dad65bd38b879079b69c48c CI <CI@example.com> 1617586185 +1000 checkout: moving from develop to master
495a8676a677db2fcd6963abc94685ab87f0f1e2 4c6b27ac04033b33a0f84869ec015b6361f28f31 CI <CI@example.com> 1617312235 +1100 commit: first commit on master c5507059e2aa65bc2dad65bd38b879079b69c48c a2a2ee2fe3ad96c470a921fe71c1216d93188c9b CI <CI@example.com> 1617586186 +1000 commit: first commit on master
4c6b27ac04033b33a0f84869ec015b6361f28f31 ce0674441b6de3c180f4cf1ff1cdf61cf8d7aa98 CI <CI@example.com> 1617312235 +1100 checkout: moving from master to develop a2a2ee2fe3ad96c470a921fe71c1216d93188c9b 417a3f75c440e565dab9b5afa78747ef37446348 CI <CI@example.com> 1617586186 +1000 checkout: moving from master to develop
ce0674441b6de3c180f4cf1ff1cdf61cf8d7aa98 c21e6aeba03d5176c28b213be71d3a02e4966c87 CI <CI@example.com> 1617312235 +1100 commit: second commit on develop 417a3f75c440e565dab9b5afa78747ef37446348 4e71d4ff127ae9e3d482239e16dc1d78e56feec0 CI <CI@example.com> 1617586186 +1000 commit: second commit on develop
c21e6aeba03d5176c28b213be71d3a02e4966c87 4c6b27ac04033b33a0f84869ec015b6361f28f31 CI <CI@example.com> 1617312235 +1100 checkout: moving from develop to master 4e71d4ff127ae9e3d482239e16dc1d78e56feec0 a2a2ee2fe3ad96c470a921fe71c1216d93188c9b CI <CI@example.com> 1617586186 +1000 checkout: moving from develop to master
4c6b27ac04033b33a0f84869ec015b6361f28f31 9a415e7414f26bbb93a9369576b6135e29bc7391 CI <CI@example.com> 1617312235 +1100 commit: second commit on master a2a2ee2fe3ad96c470a921fe71c1216d93188c9b a69f126bd3e0b9dc222cd35c8d9d7dba3d62cf2d CI <CI@example.com> 1617586186 +1000 commit: second commit on master
9a415e7414f26bbb93a9369576b6135e29bc7391 c21e6aeba03d5176c28b213be71d3a02e4966c87 CI <CI@example.com> 1617312235 +1100 checkout: moving from master to develop a69f126bd3e0b9dc222cd35c8d9d7dba3d62cf2d 4e71d4ff127ae9e3d482239e16dc1d78e56feec0 CI <CI@example.com> 1617586186 +1000 checkout: moving from master to develop
c21e6aeba03d5176c28b213be71d3a02e4966c87 2d1c52f1a9818ac62a981dbf9f7a95bd5aa0bf2e CI <CI@example.com> 1617312235 +1100 commit: third commit on develop 4e71d4ff127ae9e3d482239e16dc1d78e56feec0 fe1f8f70f67822120b40d9d704011aec6e17c3a7 CI <CI@example.com> 1617586186 +1000 commit: third commit on develop
2d1c52f1a9818ac62a981dbf9f7a95bd5aa0bf2e 9a415e7414f26bbb93a9369576b6135e29bc7391 CI <CI@example.com> 1617312235 +1100 checkout: moving from develop to master fe1f8f70f67822120b40d9d704011aec6e17c3a7 a69f126bd3e0b9dc222cd35c8d9d7dba3d62cf2d CI <CI@example.com> 1617586186 +1000 checkout: moving from develop to master
9a415e7414f26bbb93a9369576b6135e29bc7391 43e480c08cf3864f85bef1d5698b91786926cb58 CI <CI@example.com> 1617312235 +1100 commit: third commit on master a69f126bd3e0b9dc222cd35c8d9d7dba3d62cf2d f2a15f45b921460e675a8849db39de008b2c03cb CI <CI@example.com> 1617586186 +1000 commit: third commit on master
43e480c08cf3864f85bef1d5698b91786926cb58 2d1c52f1a9818ac62a981dbf9f7a95bd5aa0bf2e CI <CI@example.com> 1617312235 +1100 checkout: moving from master to develop f2a15f45b921460e675a8849db39de008b2c03cb fe1f8f70f67822120b40d9d704011aec6e17c3a7 CI <CI@example.com> 1617586186 +1000 checkout: moving from master to develop
2d1c52f1a9818ac62a981dbf9f7a95bd5aa0bf2e 51c0794d2dfd4eb71cc06f5e894edd3931411057 CI <CI@example.com> 1617312235 +1100 commit: fourth commit on develop fe1f8f70f67822120b40d9d704011aec6e17c3a7 91e16cacdb23b0b5515c6109ea301b0cb6367010 CI <CI@example.com> 1617586186 +1000 commit: fourth commit on develop
51c0794d2dfd4eb71cc06f5e894edd3931411057 43e480c08cf3864f85bef1d5698b91786926cb58 CI <CI@example.com> 1617312235 +1100 checkout: moving from develop to master 91e16cacdb23b0b5515c6109ea301b0cb6367010 f2a15f45b921460e675a8849db39de008b2c03cb CI <CI@example.com> 1617586186 +1000 checkout: moving from develop to master
43e480c08cf3864f85bef1d5698b91786926cb58 258864d877e7897048a0894cad34fad2a5a4c709 CI <CI@example.com> 1617312235 +1100 commit: fourth commit on master f2a15f45b921460e675a8849db39de008b2c03cb 1b3e191104f74b8e4054e22e9ab3b9dcfe299743 CI <CI@example.com> 1617586186 +1000 commit: fourth commit on master
258864d877e7897048a0894cad34fad2a5a4c709 258864d877e7897048a0894cad34fad2a5a4c709 CI <CI@example.com> 1617312235 +1100 checkout: moving from master to base_branch 1b3e191104f74b8e4054e22e9ab3b9dcfe299743 1b3e191104f74b8e4054e22e9ab3b9dcfe299743 CI <CI@example.com> 1617586186 +1000 checkout: moving from master to base_branch
258864d877e7897048a0894cad34fad2a5a4c709 5d7d612ecff0165ff92363cdf90acda30170038e CI <CI@example.com> 1617312235 +1100 commit: file 1b3e191104f74b8e4054e22e9ab3b9dcfe299743 8e13f545446048648331cbe93de64b1cf22df166 CI <CI@example.com> 1617586186 +1000 commit: file
5d7d612ecff0165ff92363cdf90acda30170038e 5d7d612ecff0165ff92363cdf90acda30170038e CI <CI@example.com> 1617312235 +1100 checkout: moving from base_branch to other_branch 8e13f545446048648331cbe93de64b1cf22df166 8e13f545446048648331cbe93de64b1cf22df166 CI <CI@example.com> 1617586186 +1000 checkout: moving from base_branch to other_branch
5d7d612ecff0165ff92363cdf90acda30170038e 5d7d612ecff0165ff92363cdf90acda30170038e CI <CI@example.com> 1617312235 +1100 checkout: moving from other_branch to base_branch 8e13f545446048648331cbe93de64b1cf22df166 8e13f545446048648331cbe93de64b1cf22df166 CI <CI@example.com> 1617586186 +1000 checkout: moving from other_branch to base_branch
5d7d612ecff0165ff92363cdf90acda30170038e c28b32178002cb0046454f34e77f3d86391e748d CI <CI@example.com> 1617312235 +1100 commit: file changed 8e13f545446048648331cbe93de64b1cf22df166 0539c9baf43fb1939d8f56695ceb08a86e8e1fae CI <CI@example.com> 1617586186 +1000 commit: file changed
c28b32178002cb0046454f34e77f3d86391e748d 5d7d612ecff0165ff92363cdf90acda30170038e CI <CI@example.com> 1617312235 +1100 checkout: moving from base_branch to other_branch 0539c9baf43fb1939d8f56695ceb08a86e8e1fae 8e13f545446048648331cbe93de64b1cf22df166 CI <CI@example.com> 1617586186 +1000 checkout: moving from base_branch to other_branch
5d7d612ecff0165ff92363cdf90acda30170038e e00ef3be7687b4a13bf23199fe9c01767e9b98bc CI <CI@example.com> 1617312236 +1100 commit: asd 8e13f545446048648331cbe93de64b1cf22df166 1dd0692a163379d160e23ac52509d909b41b0a35 CI <CI@example.com> 1617586188 +1000 commit: asd
e00ef3be7687b4a13bf23199fe9c01767e9b98bc 669e34b018f5e04940e15bd9d62465c716932039 CI <CI@example.com> 1617312262 +1100 commit (merge): Merge branch 'develop' into other_branch 1dd0692a163379d160e23ac52509d909b41b0a35 32129537d40d9fb35cf3dd6fba7985870142324b CI <CI@example.com> 1617586205 +1000 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 258864d877e7897048a0894cad34fad2a5a4c709 CI <CI@example.com> 1617312235 +1100 branch: Created from HEAD 0000000000000000000000000000000000000000 1b3e191104f74b8e4054e22e9ab3b9dcfe299743 CI <CI@example.com> 1617586186 +1000 branch: Created from HEAD
258864d877e7897048a0894cad34fad2a5a4c709 5d7d612ecff0165ff92363cdf90acda30170038e CI <CI@example.com> 1617312235 +1100 commit: file 1b3e191104f74b8e4054e22e9ab3b9dcfe299743 8e13f545446048648331cbe93de64b1cf22df166 CI <CI@example.com> 1617586186 +1000 commit: file
5d7d612ecff0165ff92363cdf90acda30170038e c28b32178002cb0046454f34e77f3d86391e748d CI <CI@example.com> 1617312235 +1100 commit: file changed 8e13f545446048648331cbe93de64b1cf22df166 0539c9baf43fb1939d8f56695ceb08a86e8e1fae CI <CI@example.com> 1617586186 +1000 commit: file changed

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

@ -1,5 +1,5 @@
0000000000000000000000000000000000000000 7e28009fced47639d5a8b45ec229bcfcc265066a CI <CI@example.com> 1617312234 +1100 branch: Created from HEAD 0000000000000000000000000000000000000000 f05cdc6bb7f98285583770bec5a8d307a7805bd6 CI <CI@example.com> 1617586185 +1000 branch: Created from HEAD
7e28009fced47639d5a8b45ec229bcfcc265066a ce0674441b6de3c180f4cf1ff1cdf61cf8d7aa98 CI <CI@example.com> 1617312234 +1100 commit: first commit on develop f05cdc6bb7f98285583770bec5a8d307a7805bd6 417a3f75c440e565dab9b5afa78747ef37446348 CI <CI@example.com> 1617586185 +1000 commit: first commit on develop
ce0674441b6de3c180f4cf1ff1cdf61cf8d7aa98 c21e6aeba03d5176c28b213be71d3a02e4966c87 CI <CI@example.com> 1617312235 +1100 commit: second commit on develop 417a3f75c440e565dab9b5afa78747ef37446348 4e71d4ff127ae9e3d482239e16dc1d78e56feec0 CI <CI@example.com> 1617586186 +1000 commit: second commit on develop
c21e6aeba03d5176c28b213be71d3a02e4966c87 2d1c52f1a9818ac62a981dbf9f7a95bd5aa0bf2e CI <CI@example.com> 1617312235 +1100 commit: third commit on develop 4e71d4ff127ae9e3d482239e16dc1d78e56feec0 fe1f8f70f67822120b40d9d704011aec6e17c3a7 CI <CI@example.com> 1617586186 +1000 commit: third commit on develop
2d1c52f1a9818ac62a981dbf9f7a95bd5aa0bf2e 51c0794d2dfd4eb71cc06f5e894edd3931411057 CI <CI@example.com> 1617312235 +1100 commit: fourth commit on develop fe1f8f70f67822120b40d9d704011aec6e17c3a7 91e16cacdb23b0b5515c6109ea301b0cb6367010 CI <CI@example.com> 1617586186 +1000 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 495a8676a677db2fcd6963abc94685ab87f0f1e2 CI <CI@example.com> 1617312234 +1100 branch: Created from HEAD 0000000000000000000000000000000000000000 c5507059e2aa65bc2dad65bd38b879079b69c48c CI <CI@example.com> 1617586185 +1000 branch: Created from HEAD
495a8676a677db2fcd6963abc94685ab87f0f1e2 78d8f05867a79068cf661a3654e1e221f6fdc5d8 CI <CI@example.com> 1617312234 +1100 commit: first commit freshman year c5507059e2aa65bc2dad65bd38b879079b69c48c 54757435deaedf649b36b12188bc8a5e3ea6a833 CI <CI@example.com> 1617586185 +1000 commit: first commit freshman year
78d8f05867a79068cf661a3654e1e221f6fdc5d8 9fe32ee7a110dbab694c978f1b03fa45f7cd7db6 CI <CI@example.com> 1617312234 +1100 commit: second commit subway eat fresh 54757435deaedf649b36b12188bc8a5e3ea6a833 5e3a33cb09434849f7bbabaaad8386c9f0508eec CI <CI@example.com> 1617586185 +1000 commit: second commit subway eat fresh
9fe32ee7a110dbab694c978f1b03fa45f7cd7db6 9119187695a5b19287b68b0732f9142eee7dc221 CI <CI@example.com> 1617312234 +1100 commit: third commit fresh 5e3a33cb09434849f7bbabaaad8386c9f0508eec a42af37388a9ad2eac85f71828cfc63262c90900 CI <CI@example.com> 1617586185 +1000 commit: third commit fresh
9119187695a5b19287b68b0732f9142eee7dc221 fd64b741be226a9fe125acf45a438c089a845fea CI <CI@example.com> 1617312234 +1100 commit: fourth commit cool a42af37388a9ad2eac85f71828cfc63262c90900 174226770a9dfeb661c9818c920568703c27c480 CI <CI@example.com> 1617586185 +1000 commit: fourth commit cool
fd64b741be226a9fe125acf45a438c089a845fea 47de5d2b09400df9f5252bfb02ecb0cf2702fd3e CI <CI@example.com> 1617312234 +1100 commit: fifth commit nice 174226770a9dfeb661c9818c920568703c27c480 eeb8990921f62a1ec3fc0be960c8068a24503ca8 CI <CI@example.com> 1617586185 +1000 commit: fifth commit nice
47de5d2b09400df9f5252bfb02ecb0cf2702fd3e 34325b634a636cb6f7fcff24cd010405e459cf90 CI <CI@example.com> 1617312234 +1100 commit: sixth commit haha eeb8990921f62a1ec3fc0be960c8068a24503ca8 00dc25bdd47993a880597e0680039d04a4d3328d CI <CI@example.com> 1617586185 +1000 commit: sixth commit haha
34325b634a636cb6f7fcff24cd010405e459cf90 bcad87f16cdd4fd10adbf9a1976671bad9b0c8aa CI <CI@example.com> 1617312234 +1100 commit: seventh commit yeah 00dc25bdd47993a880597e0680039d04a4d3328d fbd2d93aec237d4e44e44f3647067972c3fa69f5 CI <CI@example.com> 1617586185 +1000 commit: seventh commit yeah
bcad87f16cdd4fd10adbf9a1976671bad9b0c8aa 7e28009fced47639d5a8b45ec229bcfcc265066a CI <CI@example.com> 1617312234 +1100 commit: eighth commit woo fbd2d93aec237d4e44e44f3647067972c3fa69f5 f05cdc6bb7f98285583770bec5a8d307a7805bd6 CI <CI@example.com> 1617586185 +1000 commit: eighth commit woo

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

@ -1,5 +1,5 @@
0000000000000000000000000000000000000000 495a8676a677db2fcd6963abc94685ab87f0f1e2 CI <CI@example.com> 1617312234 +1100 commit (initial): first commit 0000000000000000000000000000000000000000 c5507059e2aa65bc2dad65bd38b879079b69c48c CI <CI@example.com> 1617586185 +1000 commit (initial): first commit
495a8676a677db2fcd6963abc94685ab87f0f1e2 4c6b27ac04033b33a0f84869ec015b6361f28f31 CI <CI@example.com> 1617312235 +1100 commit: first commit on master c5507059e2aa65bc2dad65bd38b879079b69c48c a2a2ee2fe3ad96c470a921fe71c1216d93188c9b CI <CI@example.com> 1617586186 +1000 commit: first commit on master
4c6b27ac04033b33a0f84869ec015b6361f28f31 9a415e7414f26bbb93a9369576b6135e29bc7391 CI <CI@example.com> 1617312235 +1100 commit: second commit on master a2a2ee2fe3ad96c470a921fe71c1216d93188c9b a69f126bd3e0b9dc222cd35c8d9d7dba3d62cf2d CI <CI@example.com> 1617586186 +1000 commit: second commit on master
9a415e7414f26bbb93a9369576b6135e29bc7391 43e480c08cf3864f85bef1d5698b91786926cb58 CI <CI@example.com> 1617312235 +1100 commit: third commit on master a69f126bd3e0b9dc222cd35c8d9d7dba3d62cf2d f2a15f45b921460e675a8849db39de008b2c03cb CI <CI@example.com> 1617586186 +1000 commit: third commit on master
43e480c08cf3864f85bef1d5698b91786926cb58 258864d877e7897048a0894cad34fad2a5a4c709 CI <CI@example.com> 1617312235 +1100 commit: fourth commit on master f2a15f45b921460e675a8849db39de008b2c03cb 1b3e191104f74b8e4054e22e9ab3b9dcfe299743 CI <CI@example.com> 1617586186 +1000 commit: fourth commit on master

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

@ -1,4 +1,3 @@
0000000000000000000000000000000000000000 5d7d612ecff0165ff92363cdf90acda30170038e CI <CI@example.com> 1617312235 +1100 branch: Created from HEAD 0000000000000000000000000000000000000000 8e13f545446048648331cbe93de64b1cf22df166 CI <CI@example.com> 1617586186 +1000 branch: Created from HEAD
5d7d612ecff0165ff92363cdf90acda30170038e e00ef3be7687b4a13bf23199fe9c01767e9b98bc CI <CI@example.com> 1617312236 +1100 commit: asd 8e13f545446048648331cbe93de64b1cf22df166 1dd0692a163379d160e23ac52509d909b41b0a35 CI <CI@example.com> 1617586188 +1000 commit: asd
e00ef3be7687b4a13bf23199fe9c01767e9b98bc 669e34b018f5e04940e15bd9d62465c716932039 CI <CI@example.com> 1617312262 +1100 commit (merge): Merge branch 'develop' into other_branch 1dd0692a163379d160e23ac52509d909b41b0a35 32129537d40d9fb35cf3dd6fba7985870142324b CI <CI@example.com> 1617586205 +1000 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/00/dc25bdd47993a880597e0680039d04a4d3328d Normal file
View File

@ -0,0 +1,3 @@
xЌЋM
В0F]зіd&НПD„®zЊI:Ў‚±ҐFис-x·псѕјФъh`СќЪ¦
™¦‰\p1€“.–RўOМЃ¬DbЛ¤В]тlVЩфХ@5qЯco©+¤№+“ц3c`±Оc—…Ќ|Ъјl0ЊpЖ»оRЧ§^тRo@Ѓў?мбL€hЋх8ХфOЬј{›бgБ,і�/яЛ=Г

3
test/integration/mergeConflicts/expected/.git_keep/objects/05/39c9baf43fb1939d8f56695ceb08a86e8e1fae Normal file
View File

@ -0,0 +1,3 @@
xŤÎM
Ă @á®=…űBqtJ)d•cč86�ć‡`ˇÇoŽĐíă[<Ţ–eîRşôCD7@âĐB‰C� ąn)KôÂmŕPĹŞ=˛v\óčÉ`$ŚÎI®
anÖÖD*ú´ző}źňÍËţ–oËCAđ‘ ’ľ‚1Fťőśęň'Wm~‹ć)Ż/©ę! <<

3
test/integration/mergeConflicts/expected/.git_keep/objects/17/4226770a9dfeb661c9818c920568703c27c480 Normal file
View File

@ -0,0 +1,3 @@
x�ŽK
à E;vÎ ÅOÔ'”RÈ(˸ñC
±1ÐåWè::p9N¨¥¼:WÂ\zK‰G8£Í+€ Š„†dݤV’�ð‚héÝ9&…¬�&‚GT �Lv’…¬VV/¼ gßjãóÂïóòL”cO·P˃K+�!+Éð«ÃëˆêéO�åz¶¾ñßm îì Åm>ì

3
test/integration/mergeConflicts/expected/.git_keep/objects/1b/3e191104f74b8e4054e22e9ab3b9dcfe299743 Normal file
View File

@ -0,0 +1,3 @@
x�ŽA
Â0E]ç³d¦MÒD„®zŒI2¡‚1%¦àñ-x·�ÿø/ÖRÂSo"0ê8i²$’½u9zC1Ó„ŒD™‡,)…˜ÔÆM^òÀd²6Á¤-Š� ;§}
£O‚èÂqŒAñÞ×Ú`^à:/wùpÙžr‰µÜปŒ³ä,œ ÕA�¨.ÎU®{ë+ü4¨/(ü>lõ&âA/

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

Binary file not shown.

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

@ -1,2 +0,0 @@
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/2d/1c52f1a9818ac62a981dbf9f7a95bd5aa0bf2e
View File

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

BIN
test/integration/mergeConflicts/expected/.git_keep/objects/41/7a3f75c440e565dab9b5afa78747ef37446348 Normal file
View File

Binary file not shown.

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

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

Binary file not shown.

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

Binary file not shown.

BIN
test/integration/mergeConflicts/expected/.git_keep/objects/a4/6fe3d80027b2887996ba65853fb0591915d051 → test/integration/mergeConflicts/expected/.git_keep/objects/49/7b1e236588f0e2674c9a5787abeb226abf3680
View File

Binary file not shown.

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

@ -1,2 +0,0 @@
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/4e/71d4ff127ae9e3d482239e16dc1d78e56feec0 Normal file
View File

Binary file not shown.

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

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

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

3
test/integration/mergeConflicts/expected/.git_keep/objects/54/757435deaedf649b36b12188bc8a5e3ea6a833 Normal file
View File

@ -0,0 +1,3 @@
x��A
à »öî EM4
¥²Ê1¾ß' Ô& ííèºz0Ìb¯¥,MÝ�Z¤3’`ô½é¡R—�Cì@†9º˜A™È‹�*žM²µjP6À9Ù$JǦÎG?5„è÷ž½Ú¼V9Nò:Nw¼©l\x-7©�¬wÚ[yÖJ)qÐ#ªáO]ä¥îGÊïJ®ØçBOùUñÌ™Cƒ

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

Binary file not shown.

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

Binary file not shown.

BIN
test/integration/mergeConflicts/expected/.git_keep/objects/5e/3a33cb09434849f7bbabaaad8386c9f0508eec Normal file
View File

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

2
test/integration/mergeConflicts/expected/.git_keep/objects/8e/13f545446048648331cbe93de64b1cf22df166 Normal file
View File

@ -0,0 +1,2 @@
xЌЋK
В0]зЩ т'НлЎ«#Џ/Xhl)<ѕ9‚Ыa&п­­]*V—~RS°9”B1Шў°e�’tLЄs‰=ЕвЅ8в‰чУ„+2Х›`Иh ЋiJ\r…fцfсУ_ы)зEЮзе‰olЗ†[ЮЫC*§ј N'ЇЉ€Д cЄгO]Фuѓш:U9P

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

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

2
test/integration/mergeConflicts/expected/.git_keep/objects/91/e16cacdb23b0b5515c6109ea301b0cb6367010 Normal file
View File

@ -0,0 +1,2 @@
x█▌M
б0F]ГЁd&█≥D└╝z▄ЭL╗п≤RЯЬ╪─шО╫_╛╔<;h╒So" чи░ \й├C┼з8Gрх1Im╬и╚Cй.3fкNК┐┐iL▄┴╪D+дqП╛Эч≈з` А6мЫЬ╡╜r┴╣э│,ЯуYrн└┬ЙX▐S]ЧтU╝{К Э2╗/HР√╣nЙ fтAc

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

@ -1,4 +0,0 @@
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
View File

Binary file not shown.

4
test/integration/mergeConflicts/expected/.git_keep/objects/a2/a2ee2fe3ad96c470a921fe71c1216d93188c9b Normal file
View File

@ -0,0 +1,4 @@
x��K
1D]çÙ ’ºAD˜Õ£'ÓÁc†L�oÀ ¸*(êÁ«TKÙº4
O½1KŸ-;�°¸@¨MV=9@ˆÎ2F´Î&0ÙŠ�¿ºLÞ«¨<²!
~If¥uäja�ˆ*â09H‚ÞýQ›œfy�æ;¨ìO¾¤ZnR= AžµRJŒvHuþs.òÖŽ¡ò»R_²Ð1`ñìÑ?U

3
test/integration/mergeConflicts/expected/.git_keep/objects/a4/2af37388a9ad2eac85f71828cfc63262c90900 Normal file
View File

@ -0,0 +1,3 @@
x��K
Β0@]η³d�@Dθ�Η�L¦΄`l‰<Ύ/ΰφρ<ήj];ht§ήD D
μ°0e«³Ξ^‹γΈ°°x�Ε$os±j§&ΟN Γ“56Ϊ4‡�)Q‰&zN3:�"¬θέ—­Α8Αu�ξς΅Ί?δΒ[½Αΰ‡ΰΆΆƒσ€�κ ΗT—?uΥ—µψU07y-κ [Ϋ@

2
test/integration/mergeConflicts/expected/.git_keep/objects/a6/9f126bd3e0b9dc222cd35c8d9d7dba3d62cf2d Normal file
View File

@ -0,0 +1,2 @@
x�ŽA
Â0E]ç³$“¶“D„®zŒÉtŠ‚iJÁãð.ÿã?þ—’ó³‚C{ª»*Ø(Iƒ�G/–˜0xJ>Q�Ü·èÒÒɆÙl¼ëZ�;U·hÇs$é½åèpQ�‚iŽ† 1~×GÙaœà:NwýpÞ^z‘’o€„~mŠàŒÖZÓh;UõϺ9TÊ:ÃOƒ²Bæ£Ùæ ®?@]

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

@ -1,3 +0,0 @@
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ÁŻ�Źđ¤ľ¸Ä>ó

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

Binary file not shown.

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

@ -1,2 +0,0 @@
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/c5/507059e2aa65bc2dad65bd38b879079b69c48c Normal file
View File

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

BIN
test/integration/mergeConflicts/expected/.git_keep/objects/ee/b8990921f62a1ec3fc0be960c8068a24503ca8 Normal file
View File

Binary file not shown.

2
test/integration/mergeConflicts/expected/.git_keep/objects/f0/5cdc6bb7f98285583770bec5a8d307a7805bd6 Normal file
View File

@ -0,0 +1,2 @@
x�ŽM
Â0F]ç³$“ŸI"BW=FšLlÁ˜R"z|+^@øV�÷àK­Ö¥ƒ’æÐ7fp^QfÓ4)—¤¤Åàˆ\±¨ Ñ'kÄ7~t(SV9èÈIi— ›ïŠ&ã$¹àTÒ%R(VÄgŸÛÃça¼ò;ÖõΧÔê�ÐYOè-QJ)vºŸêü§.x¹Í}†_¯ÖÄîQ=²

3
test/integration/mergeConflicts/expected/.git_keep/objects/f2/a15f45b921460e675a8849db39de008b2c03cb Normal file
View File

@ -0,0 +1,3 @@
x�ŽK
Â0@]ç³$¿N& "¸òÓÌ„Œ-5‚Ç·àÜ>ÞƒW–ÖæÞæCßTÁ»D\Ó`C„89—¢Å<j”H•#�\ÍÊ›>;0æê<ŽÔŽYŠ÷¾H
I–$#A_ªÃï>-Üîp¾Ý¯úá¶>ôT–v‡. „ŽŽÎZkvºOuýS7}š7�_Ë¿öØ|Aß@

2
test/integration/mergeConflicts/expected/.git_keep/objects/fb/d2d93aec237d4e44e44f3647067972c3fa69f5 Normal file
View File

@ -0,0 +1,2 @@
x�ŽK
Â0@]ç³dòO@DèªÇ˜dF*X[j½½/àöñ¼ºÌóµ�Á°k›0¼DcBÔ¾’÷�d}!6%Q%Ô…˜s¶j¥Mî ¹_˜]ì”RBŸ£`Hˆ63:rl­I¬èÙ¦eƒa„ã0žåMóz“C]æè £OA'{�ˆªÓ>ÕäO]=äÕ_&øuðšÔ~�>Š

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

Binary file not shown.

BIN
test/integration/mergeConflicts/expected/.git_keep/objects/fe/1f8f70f67822120b40d9d704011aec6e17c3a7 Normal file
View File

Binary file not shown.

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

@ -1 +1 @@
c28b32178002cb0046454f34e77f3d86391e748d 0539c9baf43fb1939d8f56695ceb08a86e8e1fae

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

@ -1 +1 @@
51c0794d2dfd4eb71cc06f5e894edd3931411057 91e16cacdb23b0b5515c6109ea301b0cb6367010

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

@ -1 +1 @@
7e28009fced47639d5a8b45ec229bcfcc265066a f05cdc6bb7f98285583770bec5a8d307a7805bd6

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

@ -1 +1 @@
258864d877e7897048a0894cad34fad2a5a4c709 1b3e191104f74b8e4054e22e9ab3b9dcfe299743

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

@ -1 +1 @@
4ea473079cfdf1776e0d7dc114501860b8ab40c4 32129537d40d9fb35cf3dd6fba7985870142324b

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

@ -1 +1 @@
test2 test3

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

@ -1 +1 @@
test2 test3

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

@ -60,4 +60,4 @@ once upon a time there was a cat
... ...
... ...
... ...
once upon a time there was another cat once upon a time there was another dog

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

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

2
test/integration/mergeConflicts/expected/file4
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,2 +1 @@
once upon a time there was a horse
once upon a time there was a mouse 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": "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 } { "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": 10 }