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

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

3
test/integration/mergeConflicts/expected/.git_keep/objects/00/dc25bdd47993a880597e0680039d04a4d3328d Normal file
View File

@@ -0,0 +1,3 @@
x<01><>M
<EFBFBD>0F]<5D><14>d&<26><>D<><44>z<EFBFBD>I:<3A><><EFBFBD><EFBFBD>F<EFBFBD><46>-x<01><1F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>h`ѝڦ
<EFBFBD><EFBFBD><EFBFBD>\p1<70><31>.<2E>R<EFBFBD>Ó<4F>Dbˤ<62>]<5D>lV<6C><56><EFBFBD>@5q<35>co<63>+<2B><>+<19><>3c`<60><>c<EFBFBD><63><EFBFBD>|ڼl0<6C>pƻ<>Rק^<5E>Ro@<40><>?<12><>L<EFBFBD>h<EFBFBD><68>8<EFBFBD><38>Oܼ{<7B><>g<EFBFBD>,<2C><>/<2F><>=<3D>

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

@@ -0,0 +1,3 @@
x<01><>M
<EFBFBD> @<40><>=<3D><>BqtJ)d<>c<EFBFBD>86<38><36><EFBFBD>`<60><>o<EFBFBD><6F><EFBFBD><EFBFBD>[<ޖe<DE96>R<><52>CD7@<40><>B<EFBFBD>C<> <0C>n)K<11><>m<>PŪ=<1F>v\<5C><><11>`$<24><>I<>
an<><6E>D*<><7F>z<18>}<18><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>o<>CA<><41> <20><><EFBFBD>1F<31><46><EFBFBD><EFBFBD><EFBFBD>'Wm~<7E><>)<29>/<2F><>! <<

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

@@ -0,0 +1,3 @@
x<01><>K
<EFBFBD> E;v<15> <0B>O<EFBFBD>'<27>R<EFBFBD>(˸<>C
<EFBFBD>1<><31>W<EFBFBD>::p9N<><4E><EFBFBD>:W<>\zK<7A>G8<1B><>+<2B> <09><><EFBFBD>dݤV<><56><EFBFBD><1E>h<><68>9&<26><><EFBFBD>&<26>GT <09>Lv<4C><14><1C>VV/<2F> g<>j<EFBFBD><6A><EFBFBD><EFBFBD><EFBFBD><EFBFBD>L<1F>cO<63>P˃K+<2B>!+<2B><><EFBFBD><14><1D><><EFBFBD><EFBFBD>O<EFBFBD><4F>z<EFBFBD><7A><EFBFBD><EFBFBD>m<EFBFBD><6D><EFBFBD> <0B>m><3E>

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

@@ -0,0 +1,3 @@
x<01><>A
<EFBFBD>0E]<5D><14>d<>M<EFBFBD>D<><44>z<EFBFBD>I2<49><32>1%<25><><EFBFBD>-x<01><><EFBFBD><EFBFBD>/<2F>R<06>So"0<>8i<38>$<24><>u9zC1ӄ<31>D<EFBFBD><1D>,)<29><><EFBFBD><EFBFBD>M^<1D><>d<EFBFBD>6<EFBFBD><0F>-<2D><> ;<3B>}
<EFBFBD>O<EFBFBD><EFBFBD><EFBFBD>q<>A<EFBFBD><41><EFBFBD><EFBFBD>`^<5E>:/w<>pٞr<D99E><72><EFBFBD>ป<EFBFBD><E0B89B><EFBFBD>,<2C> <11>A<EFBFBD><41>.<>U<EFBFBD>{<7B>+<2B>4<EFBFBD>/(<28>>l<>&<26>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<01><>M
<EFBFBD>0F]<5D><14>$<24><>t"<22><>#<23><>P<EFBFBD><50>R#x| ^<5E><><EFBFBD>{|<7C>[<5B><><03>C<EFBFBD>D<EFBFBD>y=F<14>I9d<><64>f<EFBFBD><66><EFBFBD>rQ<72><51>³Y<C2B3>&<26>މ'˖XE<><14>(<28>!&* G<>i<EFBFBD>\<02><><EFBFBD>K<EFBFBD><4B>6<EFBFBD><36>6]<5D><><EFBFBD><EFBFBD><EFBFBD><13>z<EFBFBD><7A>nt8 .<2E><11>Z<EFBFBD><5A>=<3D>˟s<CB9F><73><EFBFBD><EFBFBD>~<1A>'<27><><EFBFBD>m<EFBFBD>n@<40>

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<01><>K
<EFBFBD>0@]<5D><14>$<24><>o@D<><44>ǘ<EFBFBD>SZ0<5A><30>߂p<>xްֺ4p<34>OmW<05>)˔<>%<25>c<>1y<1B><>}<7D><>gR/<2F><>d<EFBFBD>g<16>A<EFBFBD>G?<3F>XJa<12><>!<21><12><>:.C"F#<23>6<EFBFBD>;t=\<5C><><EFBFBD><1F><>C/<2F>Zo<5A><13>s<14><>h<EFBFBD>9<EFBFBD>1<EFBFBD><31>Oݴy<DDB4>G<EFBFBD>U<EFBFBD>><3E><><EFBFBD><EFBFBD><EFBFBD>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<01><>K
1D]<5D><14>d<>O<EFBFBD><4F>0<EFBFBD>9F'<27><>c<>L<04>o<EFBFBD> <0B><>W<EFBFBD><57>TK<54>:<3A> O<>1<EFBFBD>͚<EFBFBD><CD9A><10>#<23>*O-<2D><><EFBFBD><1B><>Q<1B><><EFBFBD>Z<EFBFBD><5A><EFBFBD><EFBFBD><EFBFBD> <1C>w<EFBFBD><77>_<EFBFBD><5F>iu<69>4ń<34>K1<4B>1!Y z<>Gm0/p<><70>;<><7F>O<EFBFBD><4F>Zn <20><>Z*<2A>-<2D><><EFBFBD>&1<>q<EFBFBD><71><EFBFBD>u<EFBFBD><75>vt<76>YP_P<5F><18><><02>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<01><>M
1 @a<>=E<><45>$<24>IS\<5C>1:m<><6D>u<EFBFBD><75><EFBFBD><EFBFBD>w<EFBFBD><77><EFBFBD><EFBFBD>-^Yz <0C><><EFBFBD><EFBFBD><EFBFBD>B<14><>b<13>1<EFBFBD>f<EFBFBD><66>sc<73><63>kn"!Vq<56><71>5o<35><1A><><EFBFBD><EFBFBD>IZP<5A>ɣR<C9A3>k<EFBFBD>l=<3D><12><><EFBFBD><EFBFBD><EFBFBD>ɟq_6<5F>Mp<4D>MW<4D><57><EFBFBD>><3E>T<EFBFBD>~b<><62><EFBFBD>e<EFBFBD>#<11><><EFBFBD>>5<>On<4F><6E><EFBFBD>\<5C>7<EFBFBD>

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

@@ -1,3 +0,0 @@
x<01><>A
<EFBFBD> E<><45><14>/<14>hT(<28><>U<EFBFBD>1<EFBFBD>H
<EFBFBD>1<><31>oJ/<2F><><EFBFBD><EFBFBD><1E>XKytP<74><50>ޘ<EFBFBD><DE98><EFBFBD><EFBFBD>yH<79>2\<5C>چ<14>v<EFBFBD>=*ic<1C>ب<EFBFBD><D8A8>F<>2<EFBFBD>w<EFBFBD>(<28><>;R<>>[<5B>&$C$CV,h<>Km0<6D>p<EFBFBD><70>;<3B><>l+_b-7<><11><>J

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

@@ -0,0 +1,3 @@
x<01><>A
<EFBFBD> <05><><14> EM4
<EFBFBD><14><>1<EFBFBD><31>' <09>& <0B><><1B><05>z0<7A>b<1E><>,MݝZ<05>3<>`<60><><EFBFBD><EFBFBD>R<EFBFBD><52>C<EFBFBD>@<40>9<EFBFBD><39>A<EFBFBD>ȋ<EFBFBD>*<2A>M<EFBFBD><4D>jP6<50>9<1B>$JǦ<4A>G?5<><35><02><><05>ڼV9N<39>:Nw<4E><77>l\x-7<><37><1E>w<EFBFBD>[y<>J)q<>#<23><>O]<5D><><EFBFBD>G<EFBFBD><47>J<EFBFBD><4A><EFBFBD>BO<42>U<>̙C<CC99>

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<01><>K
<EFBFBD>0]<5D><14> <0B>'<27><><11><>#<23>/Xhl)<<3C>9<EFBFBD><39>a&ﭭ]*V<>~RS<52>9<EFBFBD>B1آ<>e<EFBFBD><65>tL<1C>s<EFBFBD>=<3D><><EFBFBD>8<EFBFBD><38><EFBFBD>ӄ+2՛`<60>h

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

@@ -1,3 +0,0 @@
x<01><>M
<EFBFBD>0F]<5D><14>$<24>i@D<><44><EFBFBD><EFBFBD>L&<26>`l<><<3C>/<2F><><EFBFBD><EFBFBD><EFBFBD>G{<7B>[-ݩ7f<37>S
<EFBFBD>d<EFBFBD><EFBFBD>V<EFBFBD>F<EFBFBD><EFBFBD>Q<08><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Do1[q<><71><EFBFBD><0E><><EFBFBD><EFBFBD>!)%3&<26><>R SQ(MI֕<49><D695><EFBFBD>^<5E>w_<77><06><02>y<EFBFBD><79>'<27><><EFBFBD><17><>

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

@@ -0,0 +1,2 @@
x<01><>M
<EFBFBD>0F]<5D><14>d&<26><>D<><44>z<EFBFBD><7A>L<EFBFBD>ИR<><52><16><><EFBFBD><EFBFBD><EFBFBD>_<><5F><;h<>So" <20>ɐ \ʆC<CA86><43>8G<><47>1Im<49>ɫC<16>.3f<EFBFBD>N<EFBFBD><EFBFBD><06>iL<69><06><>D+<2B>q<EFBFBD><71><EFBFBD>ޗ<EFBFBD>`<60><>6<EFBFBD><0F><><EFBFBD><EFBFBD>r<EFBFBD><72>܁,<2C><>Yr΄<><CE84>X<EFBFBD>S]<5D><>U<EFBFBD>{<7B> <0B>2<EFBFBD>/H<><48><EFBFBD>n<EFBFBD> f<>Ac

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

@@ -1,4 +0,0 @@
x<01><>A
1 E]<5D><14> <0B>4<EFBFBD><34><EFBFBD><EFBFBD>0<EFBFBD>9F3(ة<><<3C>^<5E><><EFBFBD>_[<5B><><0E>p<EFBFBD>W3<57><33>K*<2A><><EFBFBD>d<EFBFBD><14><>"<22>rئ/3됆<33>{<7B>ՖA<><41><EFBFBD>2<17><>s
I<EFBFBD><EFBFBD>HC<16>}<7D><>\~<7E>[[a<><61>4N<17><><EFBFBD>|<7C>A[= E&<26>y<EFBFBD>=<11><><EFBFBD>v<EFBFBD>۟<EFBFBD>{<7B><><EFBFBD>
<EFBFBD> <0C>5<><35><EFBFBD>}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<01><>K
1D]<5D><14> <0B><EFBFBD>AD<41><44><1C>'<27><>c<>L<04>o<EFBFBD> <0B>*(<28><><EFBFBD>TKٺ4
O<EFBFBD>1K<EFBFBD>-;<3B><><EFBFBD>@<40>MV=9@<40><>2F<32><46>&0ي<30><1A><>Lޫ<4C><<3C>!
~If<49>u<EFBFBD>ja<6A><61>*<2A>09H<39><48><EFBFBD>Q<EFBFBD><51>fy<66><79>;<><7F>O<EFBFBD><4F>ZnR=

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

@@ -0,0 +1,3 @@
x<01><>K
<EFBFBD>0@]<5D><14>d<>@D<><44>ǘL<C798><4C>`l<><<3C>/<2F><><EFBFBD><<3C>j];ht<68><74>D<EFBFBD>D
<EFBFBD><EFBFBD>0e<EFBFBD><EFBFBD><EFBFBD>^<5E><><10><><EFBFBD>x<EFBFBD><78>$os<6F>j<EFBFBD>&<26>N <19><19>56<35>4<EFBFBD><34>)Q<>&zN3:<3A>"<22><>ݗ<EFBFBD><DD97>8<EFBFBD>u<EFBFBD><75><EFBFBD><EFBFBD><EFBFBD>?<3F><>[<5B><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><1F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>T<EFBFBD>?u՗<75><15>U07y-<2D> [<5B>@

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

@@ -0,0 +1,2 @@
x<01><>A
<EFBFBD>0E]<5D><14>$<24><><EFBFBD>D<><44>z<EFBFBD><7A>t<EFBFBD><74>iJ<1B><><1B>.<2E><>?<3F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>C{<7B><>*<2A>(I<><49>G/<2F><>0xJ>Q<>ܷ<EFBFBD><DCB7><EFBFBD><EFBFBD><10><>l<EFBFBD><6C>Z<EFBFBD>;U<>h<EFBFBD>s$<24><><EFBFBD><EFBFBD>pQ<70><51>i<><1D> 1~<7E>G<EFBFBD>a<EFBFBD><61>:Nw<4E>p<EFBFBD>^z<><7A>o<EFBFBD><6F>~m<><6D><EFBFBD><EFBFBD>Z<EFBFBD>h;U<>Ϻ9T<39>:<3A>O<EFBFBD><4F>B<EFBFBD><42><EFBFBD><EFBFBD> <0B>?@]

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

@@ -1,3 +0,0 @@
x<01><>K
<EFBFBD>0@]<5D><14>d&_"BW=<3D>$<24>P<EFBFBD><50>R<EFBFBD><52><EFBFBD>-x<01><><EFBFBD><EFBFBD>幵k<07>~<7E>W(<28><><06>} <20>ٹ<EFBFBD>V"U.:93R<33>Rb4j<34>U<EFBFBD><1D>5<EFBFBD>%o,{<7B>s<EFBFBD>5<EFBFBD>\<5C><><EFBFBD> <20>E'<27><>\#*~<7E>i^a<18>4<EFBFBD>ys[nr<6E>s;y
<EFBFBD><EFBFBD>6<16>D<EFBFBD>j<EFBFBD><6A>T<EFBFBD>?u<><75><EFBFBD><EFBFBD>2<EFBFBD><32><EFBFBD><EFBFBD>𤾸<EFBFBD>><3E>

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<01><>K
<EFBFBD>0<10>a<EFBFBD>9<EFBFBD><39><05><>5

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<01><>M
<EFBFBD>0F]<5D><14>$<24><>I"BW=F<>Ll<4C><6C>R"z|+^@<40>V<EFBFBD><56><EFBFBD>K<EFBFBD>֥<EFBFBD><D6A5><EFBFBD><EFBFBD>7fp^Qf<13>4)<03><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\<5C><> <09>'k<>7~t(SV9<56><39>Ii<49>

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

@@ -0,0 +1,3 @@
x<01><>K
<EFBFBD>0@]<5D><14>$<24>N& "<22><><18>̄<16>-5<>Ƿ<EFBFBD><05>>ރW<DE83><57><EFBFBD><0E><>C<EFBFBD>T<EFBFBD><54>D\<5C>`C<0E>89<><39><EFBFBD><j<>H<EFBFBD>#<05>\<5C>ʛ>;0<><30><<3C>ԎY<D48E><59><EFBFBD>H
I<EFBFBD>$#A_<41><17><>>-<1B><>p<EFBFBD>ݯ<EFBFBD><DDAF><EFBFBD>><3E>T<EFBFBD>v<01>.

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

@@ -0,0 +1,2 @@
x<01><>K
<EFBFBD>0@]<5D><14>d<>O@D<><44>ǘdF*X[j<14><>/<2F><><EFBFBD><1E><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>k<EFBFBD>0<06>DcBԾ<42><D4BE><05>d}!6%Q%ԅ<>s<EFBFBD>j<EFBFBD>M<EFBFBD>

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