From f08f248cb7e597ece9bde264c8800baa013280cc Mon Sep 17 00:00:00 2001 From: Jesse Duffield Date: Mon, 5 Apr 2021 11:26:31 +1000 Subject: update merge conflict test --- .../expected/.git_keep/COMMIT_EDITMSG | 37 ++++++++++- .../mergeConflicts/expected/.git_keep/ORIG_HEAD | 2 +- .../mergeConflicts/expected/.git_keep/index | Bin 1814 -> 1814 bytes .../mergeConflicts/expected/.git_keep/logs/HEAD | 69 ++++++++++----------- .../expected/.git_keep/logs/refs/heads/base_branch | 6 +- .../expected/.git_keep/logs/refs/heads/develop | 10 +-- .../logs/refs/heads/feature/cherry-picking | 18 +++--- .../expected/.git_keep/logs/refs/heads/master | 10 +-- .../.git_keep/logs/refs/heads/other_branch | 7 +-- .../00/dc25bdd47993a880597e0680039d04a4d3328d | 3 + .../05/39c9baf43fb1939d8f56695ceb08a86e8e1fae | 3 + .../17/4226770a9dfeb661c9818c920568703c27c480 | 3 + .../1b/3e191104f74b8e4054e22e9ab3b9dcfe299743 | 3 + .../1d/d0692a163379d160e23ac52509d909b41b0a35 | Bin 0 -> 147 bytes .../25/8864d877e7897048a0894cad34fad2a5a4c709 | 2 - .../2d/1c52f1a9818ac62a981dbf9f7a95bd5aa0bf2e | Bin 158 -> 0 bytes .../32/129537d40d9fb35cf3dd6fba7985870142324b | Bin 0 -> 202 bytes .../34/325b634a636cb6f7fcff24cd010405e459cf90 | Bin 155 -> 0 bytes .../41/7a3f75c440e565dab9b5afa78747ef37446348 | Bin 0 -> 158 bytes .../43/e480c08cf3864f85bef1d5698b91786926cb58 | 2 - .../47/de5d2b09400df9f5252bfb02ecb0cf2702fd3e | Bin 154 -> 0 bytes .../49/5a8676a677db2fcd6963abc94685ab87f0f1e2 | Bin 121 -> 0 bytes .../49/7b1e236588f0e2674c9a5787abeb226abf3680 | Bin 0 -> 407 bytes .../4c/6b27ac04033b33a0f84869ec015b6361f28f31 | 2 - .../4e/71d4ff127ae9e3d482239e16dc1d78e56feec0 | Bin 0 -> 158 bytes .../4e/a473079cfdf1776e0d7dc114501860b8ab40c4 | 2 - .../51/c0794d2dfd4eb71cc06f5e894edd3931411057 | 3 - .../54/757435deaedf649b36b12188bc8a5e3ea6a833 | 3 + .../5d/7d612ecff0165ff92363cdf90acda30170038e | Bin 147 -> 0 bytes .../5d/874a902548f753e50944827e572a7470aa9731 | Bin 0 -> 107 bytes .../5e/3a33cb09434849f7bbabaaad8386c9f0508eec | Bin 0 -> 163 bytes .../66/9e34b018f5e04940e15bd9d62465c716932039 | Bin 202 -> 0 bytes .../78/129d0f826754f2f8da7af68404daf8857d83cf | Bin 429 -> 0 bytes .../78/d8f05867a79068cf661a3654e1e221f6fdc5d8 | Bin 160 -> 0 bytes .../7e/28009fced47639d5a8b45ec229bcfcc265066a | Bin 153 -> 0 bytes .../86/03b3753f0207a212c71189d6154cd7a06f3f62 | Bin 57 -> 0 bytes .../8e/13f545446048648331cbe93de64b1cf22df166 | 2 + .../91/19187695a5b19287b68b0732f9142eee7dc221 | 3 - .../91/e16cacdb23b0b5515c6109ea301b0cb6367010 | 2 + .../9a/415e7414f26bbb93a9369576b6135e29bc7391 | 4 -- .../9f/e32ee7a110dbab694c978f1b03fa45f7cd7db6 | Bin 163 -> 0 bytes .../a2/a2ee2fe3ad96c470a921fe71c1216d93188c9b | 4 ++ .../a4/2af37388a9ad2eac85f71828cfc63262c90900 | 3 + .../a4/6fe3d80027b2887996ba65853fb0591915d051 | Bin 429 -> 0 bytes .../a6/9f126bd3e0b9dc222cd35c8d9d7dba3d62cf2d | 2 + .../bc/ad87f16cdd4fd10adbf9a1976671bad9b0c8aa | 3 - .../c2/1e6aeba03d5176c28b213be71d3a02e4966c87 | Bin 157 -> 0 bytes .../c2/8b32178002cb0046454f34e77f3d86391e748d | 2 - .../c5/507059e2aa65bc2dad65bd38b879079b69c48c | Bin 0 -> 121 bytes .../ce/0674441b6de3c180f4cf1ff1cdf61cf8d7aa98 | Bin 159 -> 0 bytes .../e0/0ef3be7687b4a13bf23199fe9c01767e9b98bc | Bin 146 -> 0 bytes .../ee/b8990921f62a1ec3fc0be960c8068a24503ca8 | Bin 0 -> 154 bytes .../f0/5cdc6bb7f98285583770bec5a8d307a7805bd6 | 2 + .../f2/a15f45b921460e675a8849db39de008b2c03cb | 3 + .../fb/d2d93aec237d4e44e44f3647067972c3fa69f5 | 2 + .../fd/64b741be226a9fe125acf45a438c089a845fea | Bin 155 -> 0 bytes .../fe/1f8f70f67822120b40d9d704011aec6e17c3a7 | Bin 0 -> 158 bytes .../expected/.git_keep/refs/heads/base_branch | 2 +- .../expected/.git_keep/refs/heads/develop | 2 +- .../.git_keep/refs/heads/feature/cherry-picking | 2 +- .../expected/.git_keep/refs/heads/master | 2 +- .../expected/.git_keep/refs/heads/other_branch | 2 +- .../mergeConflicts/expected/directory/file | 2 +- .../mergeConflicts/expected/directory/file2 | 2 +- test/integration/mergeConflicts/expected/file1 | 2 +- test/integration/mergeConflicts/expected/file3 | 2 +- test/integration/mergeConflicts/expected/file4 | 2 +- test/integration/mergeConflicts/expected/file5 | 1 - test/integration/mergeConflicts/recording.json | 2 +- test/integration/mergeConflicts/test.json | 2 +- 70 files changed, 143 insertions(+), 99 deletions(-) create mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/00/dc25bdd47993a880597e0680039d04a4d3328d create mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/05/39c9baf43fb1939d8f56695ceb08a86e8e1fae create mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/17/4226770a9dfeb661c9818c920568703c27c480 create mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/1b/3e191104f74b8e4054e22e9ab3b9dcfe299743 create mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/1d/d0692a163379d160e23ac52509d909b41b0a35 delete mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/25/8864d877e7897048a0894cad34fad2a5a4c709 delete mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/2d/1c52f1a9818ac62a981dbf9f7a95bd5aa0bf2e create mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/32/129537d40d9fb35cf3dd6fba7985870142324b delete mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/34/325b634a636cb6f7fcff24cd010405e459cf90 create mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/41/7a3f75c440e565dab9b5afa78747ef37446348 delete mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/43/e480c08cf3864f85bef1d5698b91786926cb58 delete mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/47/de5d2b09400df9f5252bfb02ecb0cf2702fd3e delete mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/49/5a8676a677db2fcd6963abc94685ab87f0f1e2 create mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/49/7b1e236588f0e2674c9a5787abeb226abf3680 delete mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/4c/6b27ac04033b33a0f84869ec015b6361f28f31 create mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/4e/71d4ff127ae9e3d482239e16dc1d78e56feec0 delete mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/4e/a473079cfdf1776e0d7dc114501860b8ab40c4 delete mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/51/c0794d2dfd4eb71cc06f5e894edd3931411057 create mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/54/757435deaedf649b36b12188bc8a5e3ea6a833 delete mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/5d/7d612ecff0165ff92363cdf90acda30170038e create mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/5d/874a902548f753e50944827e572a7470aa9731 create mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/5e/3a33cb09434849f7bbabaaad8386c9f0508eec delete mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/66/9e34b018f5e04940e15bd9d62465c716932039 delete mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/78/129d0f826754f2f8da7af68404daf8857d83cf delete mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/78/d8f05867a79068cf661a3654e1e221f6fdc5d8 delete mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/7e/28009fced47639d5a8b45ec229bcfcc265066a delete mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/86/03b3753f0207a212c71189d6154cd7a06f3f62 create mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/8e/13f545446048648331cbe93de64b1cf22df166 delete mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/91/19187695a5b19287b68b0732f9142eee7dc221 create mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/91/e16cacdb23b0b5515c6109ea301b0cb6367010 delete mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/9a/415e7414f26bbb93a9369576b6135e29bc7391 delete mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/9f/e32ee7a110dbab694c978f1b03fa45f7cd7db6 create mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/a2/a2ee2fe3ad96c470a921fe71c1216d93188c9b create mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/a4/2af37388a9ad2eac85f71828cfc63262c90900 delete mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/a4/6fe3d80027b2887996ba65853fb0591915d051 create mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/a6/9f126bd3e0b9dc222cd35c8d9d7dba3d62cf2d delete mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/bc/ad87f16cdd4fd10adbf9a1976671bad9b0c8aa delete mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/c2/1e6aeba03d5176c28b213be71d3a02e4966c87 delete mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/c2/8b32178002cb0046454f34e77f3d86391e748d create mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/c5/507059e2aa65bc2dad65bd38b879079b69c48c delete mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/ce/0674441b6de3c180f4cf1ff1cdf61cf8d7aa98 delete mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/e0/0ef3be7687b4a13bf23199fe9c01767e9b98bc create mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/ee/b8990921f62a1ec3fc0be960c8068a24503ca8 create mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/f0/5cdc6bb7f98285583770bec5a8d307a7805bd6 create mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/f2/a15f45b921460e675a8849db39de008b2c03cb create mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/fb/d2d93aec237d4e44e44f3647067972c3fa69f5 delete mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/fd/64b741be226a9fe125acf45a438c089a845fea create mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/fe/1f8f70f67822120b40d9d704011aec6e17c3a7 (limited to 'test') diff --git a/test/integration/mergeConflicts/expected/.git_keep/COMMIT_EDITMSG b/test/integration/mergeConflicts/expected/.git_keep/COMMIT_EDITMSG index d72af3146..b41fd4b11 100644 --- a/test/integration/mergeConflicts/expected/.git_keep/COMMIT_EDITMSG +++ b/test/integration/mergeConflicts/expected/.git_keep/COMMIT_EDITMSG @@ -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 +# diff --git a/test/integration/mergeConflicts/expected/.git_keep/ORIG_HEAD b/test/integration/mergeConflicts/expected/.git_keep/ORIG_HEAD index 49b9c3b53..21c1550a1 100644 --- a/test/integration/mergeConflicts/expected/.git_keep/ORIG_HEAD +++ b/test/integration/mergeConflicts/expected/.git_keep/ORIG_HEAD @@ -1 +1 @@ -e00ef3be7687b4a13bf23199fe9c01767e9b98bc +1dd0692a163379d160e23ac52509d909b41b0a35 diff --git a/test/integration/mergeConflicts/expected/.git_keep/index b/test/integration/mergeConflicts/expected/.git_keep/index index b010ceb11..f2656bed9 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 706d998e5..587c36a83 100644 --- a/test/integration/mergeConflicts/expected/.git_keep/logs/HEAD +++ b/test/integration/mergeConflicts/expected/.git_keep/logs/HEAD @@ -1,35 +1,34 @@ -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 +0000000000000000000000000000000000000000 c5507059e2aa65bc2dad65bd38b879079b69c48c CI 1617586185 +1000 commit (initial): first commit +c5507059e2aa65bc2dad65bd38b879079b69c48c c5507059e2aa65bc2dad65bd38b879079b69c48c CI 1617586185 +1000 checkout: moving from master to feature/cherry-picking +c5507059e2aa65bc2dad65bd38b879079b69c48c 54757435deaedf649b36b12188bc8a5e3ea6a833 CI 1617586185 +1000 commit: first commit freshman year +54757435deaedf649b36b12188bc8a5e3ea6a833 5e3a33cb09434849f7bbabaaad8386c9f0508eec CI 1617586185 +1000 commit: second commit subway eat fresh +5e3a33cb09434849f7bbabaaad8386c9f0508eec a42af37388a9ad2eac85f71828cfc63262c90900 CI 1617586185 +1000 commit: third commit fresh +a42af37388a9ad2eac85f71828cfc63262c90900 174226770a9dfeb661c9818c920568703c27c480 CI 1617586185 +1000 commit: fourth commit cool +174226770a9dfeb661c9818c920568703c27c480 eeb8990921f62a1ec3fc0be960c8068a24503ca8 CI 1617586185 +1000 commit: fifth commit nice +eeb8990921f62a1ec3fc0be960c8068a24503ca8 00dc25bdd47993a880597e0680039d04a4d3328d CI 1617586185 +1000 commit: sixth commit haha +00dc25bdd47993a880597e0680039d04a4d3328d fbd2d93aec237d4e44e44f3647067972c3fa69f5 CI 1617586185 +1000 commit: seventh commit yeah +fbd2d93aec237d4e44e44f3647067972c3fa69f5 f05cdc6bb7f98285583770bec5a8d307a7805bd6 CI 1617586185 +1000 commit: eighth commit woo +f05cdc6bb7f98285583770bec5a8d307a7805bd6 f05cdc6bb7f98285583770bec5a8d307a7805bd6 CI 1617586185 +1000 checkout: moving from feature/cherry-picking to develop +f05cdc6bb7f98285583770bec5a8d307a7805bd6 417a3f75c440e565dab9b5afa78747ef37446348 CI 1617586185 +1000 commit: first commit on develop +417a3f75c440e565dab9b5afa78747ef37446348 c5507059e2aa65bc2dad65bd38b879079b69c48c CI 1617586185 +1000 checkout: moving from develop to master +c5507059e2aa65bc2dad65bd38b879079b69c48c a2a2ee2fe3ad96c470a921fe71c1216d93188c9b CI 1617586186 +1000 commit: first commit on master +a2a2ee2fe3ad96c470a921fe71c1216d93188c9b 417a3f75c440e565dab9b5afa78747ef37446348 CI 1617586186 +1000 checkout: moving from master to develop +417a3f75c440e565dab9b5afa78747ef37446348 4e71d4ff127ae9e3d482239e16dc1d78e56feec0 CI 1617586186 +1000 commit: second commit on develop +4e71d4ff127ae9e3d482239e16dc1d78e56feec0 a2a2ee2fe3ad96c470a921fe71c1216d93188c9b CI 1617586186 +1000 checkout: moving from develop to master +a2a2ee2fe3ad96c470a921fe71c1216d93188c9b a69f126bd3e0b9dc222cd35c8d9d7dba3d62cf2d CI 1617586186 +1000 commit: second commit on master +a69f126bd3e0b9dc222cd35c8d9d7dba3d62cf2d 4e71d4ff127ae9e3d482239e16dc1d78e56feec0 CI 1617586186 +1000 checkout: moving from master to develop +4e71d4ff127ae9e3d482239e16dc1d78e56feec0 fe1f8f70f67822120b40d9d704011aec6e17c3a7 CI 1617586186 +1000 commit: third commit on develop +fe1f8f70f67822120b40d9d704011aec6e17c3a7 a69f126bd3e0b9dc222cd35c8d9d7dba3d62cf2d CI 1617586186 +1000 checkout: moving from develop to master +a69f126bd3e0b9dc222cd35c8d9d7dba3d62cf2d f2a15f45b921460e675a8849db39de008b2c03cb CI 1617586186 +1000 commit: third commit on master +f2a15f45b921460e675a8849db39de008b2c03cb fe1f8f70f67822120b40d9d704011aec6e17c3a7 CI 1617586186 +1000 checkout: moving from master to develop +fe1f8f70f67822120b40d9d704011aec6e17c3a7 91e16cacdb23b0b5515c6109ea301b0cb6367010 CI 1617586186 +1000 commit: fourth commit on develop +91e16cacdb23b0b5515c6109ea301b0cb6367010 f2a15f45b921460e675a8849db39de008b2c03cb CI 1617586186 +1000 checkout: moving from develop to master +f2a15f45b921460e675a8849db39de008b2c03cb 1b3e191104f74b8e4054e22e9ab3b9dcfe299743 CI 1617586186 +1000 commit: fourth commit on master +1b3e191104f74b8e4054e22e9ab3b9dcfe299743 1b3e191104f74b8e4054e22e9ab3b9dcfe299743 CI 1617586186 +1000 checkout: moving from master to base_branch +1b3e191104f74b8e4054e22e9ab3b9dcfe299743 8e13f545446048648331cbe93de64b1cf22df166 CI 1617586186 +1000 commit: file +8e13f545446048648331cbe93de64b1cf22df166 8e13f545446048648331cbe93de64b1cf22df166 CI 1617586186 +1000 checkout: moving from base_branch to other_branch +8e13f545446048648331cbe93de64b1cf22df166 8e13f545446048648331cbe93de64b1cf22df166 CI 1617586186 +1000 checkout: moving from other_branch to base_branch +8e13f545446048648331cbe93de64b1cf22df166 0539c9baf43fb1939d8f56695ceb08a86e8e1fae CI 1617586186 +1000 commit: file changed +0539c9baf43fb1939d8f56695ceb08a86e8e1fae 8e13f545446048648331cbe93de64b1cf22df166 CI 1617586186 +1000 checkout: moving from base_branch to other_branch +8e13f545446048648331cbe93de64b1cf22df166 1dd0692a163379d160e23ac52509d909b41b0a35 CI 1617586188 +1000 commit: asd +1dd0692a163379d160e23ac52509d909b41b0a35 32129537d40d9fb35cf3dd6fba7985870142324b CI 1617586205 +1000 commit (merge): Merge branch 'develop' into other_branch 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 1a02889c9..d924ca3c2 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 258864d877e7897048a0894cad34fad2a5a4c709 CI 1617312235 +1100 branch: Created from HEAD -258864d877e7897048a0894cad34fad2a5a4c709 5d7d612ecff0165ff92363cdf90acda30170038e CI 1617312235 +1100 commit: file -5d7d612ecff0165ff92363cdf90acda30170038e c28b32178002cb0046454f34e77f3d86391e748d CI 1617312235 +1100 commit: file changed +0000000000000000000000000000000000000000 1b3e191104f74b8e4054e22e9ab3b9dcfe299743 CI 1617586186 +1000 branch: Created from HEAD +1b3e191104f74b8e4054e22e9ab3b9dcfe299743 8e13f545446048648331cbe93de64b1cf22df166 CI 1617586186 +1000 commit: file +8e13f545446048648331cbe93de64b1cf22df166 0539c9baf43fb1939d8f56695ceb08a86e8e1fae CI 1617586186 +1000 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 0f164a9c2..bb6a166b8 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 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 +0000000000000000000000000000000000000000 f05cdc6bb7f98285583770bec5a8d307a7805bd6 CI 1617586185 +1000 branch: Created from HEAD +f05cdc6bb7f98285583770bec5a8d307a7805bd6 417a3f75c440e565dab9b5afa78747ef37446348 CI 1617586185 +1000 commit: first commit on develop +417a3f75c440e565dab9b5afa78747ef37446348 4e71d4ff127ae9e3d482239e16dc1d78e56feec0 CI 1617586186 +1000 commit: second commit on develop +4e71d4ff127ae9e3d482239e16dc1d78e56feec0 fe1f8f70f67822120b40d9d704011aec6e17c3a7 CI 1617586186 +1000 commit: third commit on develop +fe1f8f70f67822120b40d9d704011aec6e17c3a7 91e16cacdb23b0b5515c6109ea301b0cb6367010 CI 1617586186 +1000 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 74cdfb0c9..fe42f6cc0 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 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 +0000000000000000000000000000000000000000 c5507059e2aa65bc2dad65bd38b879079b69c48c CI 1617586185 +1000 branch: Created from HEAD +c5507059e2aa65bc2dad65bd38b879079b69c48c 54757435deaedf649b36b12188bc8a5e3ea6a833 CI 1617586185 +1000 commit: first commit freshman year +54757435deaedf649b36b12188bc8a5e3ea6a833 5e3a33cb09434849f7bbabaaad8386c9f0508eec CI 1617586185 +1000 commit: second commit subway eat fresh +5e3a33cb09434849f7bbabaaad8386c9f0508eec a42af37388a9ad2eac85f71828cfc63262c90900 CI 1617586185 +1000 commit: third commit fresh +a42af37388a9ad2eac85f71828cfc63262c90900 174226770a9dfeb661c9818c920568703c27c480 CI 1617586185 +1000 commit: fourth commit cool +174226770a9dfeb661c9818c920568703c27c480 eeb8990921f62a1ec3fc0be960c8068a24503ca8 CI 1617586185 +1000 commit: fifth commit nice +eeb8990921f62a1ec3fc0be960c8068a24503ca8 00dc25bdd47993a880597e0680039d04a4d3328d CI 1617586185 +1000 commit: sixth commit haha +00dc25bdd47993a880597e0680039d04a4d3328d fbd2d93aec237d4e44e44f3647067972c3fa69f5 CI 1617586185 +1000 commit: seventh commit yeah +fbd2d93aec237d4e44e44f3647067972c3fa69f5 f05cdc6bb7f98285583770bec5a8d307a7805bd6 CI 1617586185 +1000 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 21cc73d8b..fb187ba0e 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 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 +0000000000000000000000000000000000000000 c5507059e2aa65bc2dad65bd38b879079b69c48c CI 1617586185 +1000 commit (initial): first commit +c5507059e2aa65bc2dad65bd38b879079b69c48c a2a2ee2fe3ad96c470a921fe71c1216d93188c9b CI 1617586186 +1000 commit: first commit on master +a2a2ee2fe3ad96c470a921fe71c1216d93188c9b a69f126bd3e0b9dc222cd35c8d9d7dba3d62cf2d CI 1617586186 +1000 commit: second commit on master +a69f126bd3e0b9dc222cd35c8d9d7dba3d62cf2d f2a15f45b921460e675a8849db39de008b2c03cb CI 1617586186 +1000 commit: third commit on master +f2a15f45b921460e675a8849db39de008b2c03cb 1b3e191104f74b8e4054e22e9ab3b9dcfe299743 CI 1617586186 +1000 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 f3b0e8d6b..294c5fa02 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,4 +1,3 @@ -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 +0000000000000000000000000000000000000000 8e13f545446048648331cbe93de64b1cf22df166 CI 1617586186 +1000 branch: Created from HEAD +8e13f545446048648331cbe93de64b1cf22df166 1dd0692a163379d160e23ac52509d909b41b0a35 CI 1617586188 +1000 commit: asd +1dd0692a163379d160e23ac52509d909b41b0a35 32129537d40d9fb35cf3dd6fba7985870142324b CI 1617586205 +1000 commit (merge): Merge branch 'develop' into other_branch diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/00/dc25bdd47993a880597e0680039d04a4d3328d b/test/integration/mergeConflicts/expected/.git_keep/objects/00/dc25bdd47993a880597e0680039d04a4d3328d new file mode 100644 index 000000000..fc38886e8 --- /dev/null +++ b/test/integration/mergeConflicts/expected/.git_keep/objects/00/dc25bdd47993a880597e0680039d04a4d3328d @@ -0,0 +1,3 @@ +xM +0F]d&DzI:F-xh`ѝڦ +\p1.RÓDbˤ]lV@5qco++3c`c|ڼl0pƻRק^Ro@?Lh8Oܼ{g,/= \ No newline at end of file diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/05/39c9baf43fb1939d8f56695ceb08a86e8e1fae b/test/integration/mergeConflicts/expected/.git_keep/objects/05/39c9baf43fb1939d8f56695ceb08a86e8e1fae new file mode 100644 index 000000000..d42d27687 --- /dev/null +++ b/test/integration/mergeConflicts/expected/.git_keep/objects/05/39c9baf43fb1939d8f56695ceb08a86e8e1fae @@ -0,0 +1,3 @@ +xM + @=BqtJ)dc86`o[<ޖeRCD7@BC n)KmPŪ=v\`$I +anD*z}oCA 1F'Wm~)/! << \ No newline at end of file diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/17/4226770a9dfeb661c9818c920568703c27c480 b/test/integration/mergeConflicts/expected/.git_keep/objects/17/4226770a9dfeb661c9818c920568703c27c480 new file mode 100644 index 000000000..15d9caba9 --- /dev/null +++ b/test/integration/mergeConflicts/expected/.git_keep/objects/17/4226770a9dfeb661c9818c920568703c27c480 @@ -0,0 +1,3 @@ +xK + E;v O'R(˸C +1W::p9N:W\zKG8+ dݤVh9&> LvVV/ gjLcOP˃K+!+Ozm m> \ No newline at end of file diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/1b/3e191104f74b8e4054e22e9ab3b9dcfe299743 b/test/integration/mergeConflicts/expected/.git_keep/objects/1b/3e191104f74b8e4054e22e9ab3b9dcfe299743 new file mode 100644 index 000000000..dd70f37c5 --- /dev/null +++ b/test/integration/mergeConflicts/expected/.git_keep/objects/1b/3e191104f74b8e4054e22e9ab3b9dcfe299743 @@ -0,0 +1,3 @@ +xA +0E]dMDzI21%-x/RSo"08i$u9zC1ӄD,)M^d6- ;} +OqA`^:/wpٞrป, A.U{+4/(>l&A/ \ No newline at end of file diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/1d/d0692a163379d160e23ac52509d909b41b0a35 b/test/integration/mergeConflicts/expected/.git_keep/objects/1d/d0692a163379d160e23ac52509d909b41b0a35 new file mode 100644 index 000000000..5e5e92605 Binary files /dev/null and b/test/integration/mergeConflicts/expected/.git_keep/objects/1d/d0692a163379d160e23ac52509d909b41b0a35 differ diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/25/8864d877e7897048a0894cad34fad2a5a4c709 b/test/integration/mergeConflicts/expected/.git_keep/objects/25/8864d877e7897048a0894cad34fad2a5a4c709 deleted file mode 100644 index 34d3b62c9..000000000 --- a/test/integration/mergeConflicts/expected/.git_keep/objects/25/8864d877e7897048a0894cad34fad2a5a4c709 +++ /dev/null @@ -1,2 +0,0 @@ -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/2d/1c52f1a9818ac62a981dbf9f7a95bd5aa0bf2e b/test/integration/mergeConflicts/expected/.git_keep/objects/2d/1c52f1a9818ac62a981dbf9f7a95bd5aa0bf2e deleted file mode 100644 index 88a521a36..000000000 Binary files a/test/integration/mergeConflicts/expected/.git_keep/objects/2d/1c52f1a9818ac62a981dbf9f7a95bd5aa0bf2e and /dev/null differ diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/32/129537d40d9fb35cf3dd6fba7985870142324b b/test/integration/mergeConflicts/expected/.git_keep/objects/32/129537d40d9fb35cf3dd6fba7985870142324b new file mode 100644 index 000000000..1bb1267c7 Binary files /dev/null and b/test/integration/mergeConflicts/expected/.git_keep/objects/32/129537d40d9fb35cf3dd6fba7985870142324b differ diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/34/325b634a636cb6f7fcff24cd010405e459cf90 b/test/integration/mergeConflicts/expected/.git_keep/objects/34/325b634a636cb6f7fcff24cd010405e459cf90 deleted file mode 100644 index d77ebe3af..000000000 Binary files a/test/integration/mergeConflicts/expected/.git_keep/objects/34/325b634a636cb6f7fcff24cd010405e459cf90 and /dev/null differ diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/41/7a3f75c440e565dab9b5afa78747ef37446348 b/test/integration/mergeConflicts/expected/.git_keep/objects/41/7a3f75c440e565dab9b5afa78747ef37446348 new file mode 100644 index 000000000..27325b2ab Binary files /dev/null and b/test/integration/mergeConflicts/expected/.git_keep/objects/41/7a3f75c440e565dab9b5afa78747ef37446348 differ diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/43/e480c08cf3864f85bef1d5698b91786926cb58 b/test/integration/mergeConflicts/expected/.git_keep/objects/43/e480c08cf3864f85bef1d5698b91786926cb58 deleted file mode 100644 index 0a877f7d8..000000000 --- a/test/integration/mergeConflicts/expected/.git_keep/objects/43/e480c08cf3864f85bef1d5698b91786926cb58 +++ /dev/null @@ -1,2 +0,0 @@ -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 deleted file mode 100644 index dfe80867a..000000000 Binary files a/test/integration/mergeConflicts/expected/.git_keep/objects/47/de5d2b09400df9f5252bfb02ecb0cf2702fd3e and /dev/null differ diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/49/5a8676a677db2fcd6963abc94685ab87f0f1e2 b/test/integration/mergeConflicts/expected/.git_keep/objects/49/5a8676a677db2fcd6963abc94685ab87f0f1e2 deleted file mode 100644 index ae02634d4..000000000 Binary files a/test/integration/mergeConflicts/expected/.git_keep/objects/49/5a8676a677db2fcd6963abc94685ab87f0f1e2 and /dev/null differ diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/49/7b1e236588f0e2674c9a5787abeb226abf3680 b/test/integration/mergeConflicts/expected/.git_keep/objects/49/7b1e236588f0e2674c9a5787abeb226abf3680 new file mode 100644 index 000000000..923f56302 Binary files /dev/null and b/test/integration/mergeConflicts/expected/.git_keep/objects/49/7b1e236588f0e2674c9a5787abeb226abf3680 differ diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/4c/6b27ac04033b33a0f84869ec015b6361f28f31 b/test/integration/mergeConflicts/expected/.git_keep/objects/4c/6b27ac04033b33a0f84869ec015b6361f28f31 deleted file mode 100644 index 6db47e52d..000000000 --- a/test/integration/mergeConflicts/expected/.git_keep/objects/4c/6b27ac04033b33a0f84869ec015b6361f28f31 +++ /dev/null @@ -1,2 +0,0 @@ -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/4e/71d4ff127ae9e3d482239e16dc1d78e56feec0 b/test/integration/mergeConflicts/expected/.git_keep/objects/4e/71d4ff127ae9e3d482239e16dc1d78e56feec0 new file mode 100644 index 000000000..f637207dd Binary files /dev/null and b/test/integration/mergeConflicts/expected/.git_keep/objects/4e/71d4ff127ae9e3d482239e16dc1d78e56feec0 differ diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/4e/a473079cfdf1776e0d7dc114501860b8ab40c4 b/test/integration/mergeConflicts/expected/.git_keep/objects/4e/a473079cfdf1776e0d7dc114501860b8ab40c4 deleted file mode 100644 index a8cba65d0..000000000 --- a/test/integration/mergeConflicts/expected/.git_keep/objects/4e/a473079cfdf1776e0d7dc114501860b8ab40c4 +++ /dev/null @@ -1,2 +0,0 @@ -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 deleted file mode 100644 index 1011da458..000000000 --- a/test/integration/mergeConflicts/expected/.git_keep/objects/51/c0794d2dfd4eb71cc06f5e894edd3931411057 +++ /dev/null @@ -1,3 +0,0 @@ -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/54/757435deaedf649b36b12188bc8a5e3ea6a833 b/test/integration/mergeConflicts/expected/.git_keep/objects/54/757435deaedf649b36b12188bc8a5e3ea6a833 new file mode 100644 index 000000000..ebdcf28a2 --- /dev/null +++ b/test/integration/mergeConflicts/expected/.git_keep/objects/54/757435deaedf649b36b12188bc8a5e3ea6a833 @@ -0,0 +1,3 @@ +xA +  EM4 +1' & z0b,MݝZ3`RC@9Aȋ*MjP69$JǦG?5ڼV9N:Nwl\x-7w[yJ)q#O]GJBOU̙C \ 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 deleted file mode 100644 index 7a2dae55f..000000000 Binary files a/test/integration/mergeConflicts/expected/.git_keep/objects/5d/7d612ecff0165ff92363cdf90acda30170038e and /dev/null differ diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/5d/874a902548f753e50944827e572a7470aa9731 b/test/integration/mergeConflicts/expected/.git_keep/objects/5d/874a902548f753e50944827e572a7470aa9731 new file mode 100644 index 000000000..9633a4077 Binary files /dev/null and b/test/integration/mergeConflicts/expected/.git_keep/objects/5d/874a902548f753e50944827e572a7470aa9731 differ diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/5e/3a33cb09434849f7bbabaaad8386c9f0508eec b/test/integration/mergeConflicts/expected/.git_keep/objects/5e/3a33cb09434849f7bbabaaad8386c9f0508eec new file mode 100644 index 000000000..1b6dcc55d Binary files /dev/null and b/test/integration/mergeConflicts/expected/.git_keep/objects/5e/3a33cb09434849f7bbabaaad8386c9f0508eec differ diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/66/9e34b018f5e04940e15bd9d62465c716932039 b/test/integration/mergeConflicts/expected/.git_keep/objects/66/9e34b018f5e04940e15bd9d62465c716932039 deleted file mode 100644 index 3d485ea3a..000000000 Binary files a/test/integration/mergeConflicts/expected/.git_keep/objects/66/9e34b018f5e04940e15bd9d62465c716932039 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 deleted file mode 100644 index 69607a60e..000000000 Binary files a/test/integration/mergeConflicts/expected/.git_keep/objects/78/129d0f826754f2f8da7af68404daf8857d83cf and /dev/null differ diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/78/d8f05867a79068cf661a3654e1e221f6fdc5d8 b/test/integration/mergeConflicts/expected/.git_keep/objects/78/d8f05867a79068cf661a3654e1e221f6fdc5d8 deleted file mode 100644 index 48a86e556..000000000 Binary files a/test/integration/mergeConflicts/expected/.git_keep/objects/78/d8f05867a79068cf661a3654e1e221f6fdc5d8 and /dev/null differ diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/7e/28009fced47639d5a8b45ec229bcfcc265066a b/test/integration/mergeConflicts/expected/.git_keep/objects/7e/28009fced47639d5a8b45ec229bcfcc265066a deleted file mode 100644 index aa7368f74..000000000 Binary files a/test/integration/mergeConflicts/expected/.git_keep/objects/7e/28009fced47639d5a8b45ec229bcfcc265066a and /dev/null differ diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/86/03b3753f0207a212c71189d6154cd7a06f3f62 b/test/integration/mergeConflicts/expected/.git_keep/objects/86/03b3753f0207a212c71189d6154cd7a06f3f62 deleted file mode 100644 index 099aa4250..000000000 Binary files a/test/integration/mergeConflicts/expected/.git_keep/objects/86/03b3753f0207a212c71189d6154cd7a06f3f62 and /dev/null differ diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/8e/13f545446048648331cbe93de64b1cf22df166 b/test/integration/mergeConflicts/expected/.git_keep/objects/8e/13f545446048648331cbe93de64b1cf22df166 new file mode 100644 index 000000000..1ed4cdd2a --- /dev/null +++ b/test/integration/mergeConflicts/expected/.git_keep/objects/8e/13f545446048648331cbe93de64b1cf22df166 @@ -0,0 +1,2 @@ +xK +0] '#/Xhl)<9a&ﭭ]*V~RS9B1آetLs=8ӄ+2՛`h iJ\rff_)Eoldž[C* N'ĠcO]u:U9P \ No newline at end of file diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/91/19187695a5b19287b68b0732f9142eee7dc221 b/test/integration/mergeConflicts/expected/.git_keep/objects/91/19187695a5b19287b68b0732f9142eee7dc221 deleted file mode 100644 index 552afabd3..000000000 --- a/test/integration/mergeConflicts/expected/.git_keep/objects/91/19187695a5b19287b68b0732f9142eee7dc221 +++ /dev/null @@ -1,3 +0,0 @@ -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/e16cacdb23b0b5515c6109ea301b0cb6367010 b/test/integration/mergeConflicts/expected/.git_keep/objects/91/e16cacdb23b0b5515c6109ea301b0cb6367010 new file mode 100644 index 000000000..979a5d3db --- /dev/null +++ b/test/integration/mergeConflicts/expected/.git_keep/objects/91/e16cacdb23b0b5515c6109ea301b0cb6367010 @@ -0,0 +1,2 @@ +xM +0F]d&DzLИR_<;hSo" ɐ \ʆC8G1ImɫC.3fNiLD+qޗ`6r܁,Yr΄XS]U{ 2/Hn fAc \ No newline at end of file diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/9a/415e7414f26bbb93a9369576b6135e29bc7391 b/test/integration/mergeConflicts/expected/.git_keep/objects/9a/415e7414f26bbb93a9369576b6135e29bc7391 deleted file mode 100644 index 1c96a4134..000000000 --- a/test/integration/mergeConflicts/expected/.git_keep/objects/9a/415e7414f26bbb93a9369576b6135e29bc7391 +++ /dev/null @@ -1,4 +0,0 @@ -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 deleted file mode 100644 index 288d56942..000000000 Binary files a/test/integration/mergeConflicts/expected/.git_keep/objects/9f/e32ee7a110dbab694c978f1b03fa45f7cd7db6 and /dev/null differ diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/a2/a2ee2fe3ad96c470a921fe71c1216d93188c9b b/test/integration/mergeConflicts/expected/.git_keep/objects/a2/a2ee2fe3ad96c470a921fe71c1216d93188c9b new file mode 100644 index 000000000..1db4d9945 --- /dev/null +++ b/test/integration/mergeConflicts/expected/.git_keep/objects/a2/a2ee2fe3ad96c470a921fe71c1216d93188c9b @@ -0,0 +1,4 @@ +xK +1D] AD'cLo *(TKٺ4 +O1K-;@MV=9@2F&0يLޫQܷlZ;Uhs$pQi 1~Ga:Nwp^zo~mZh;UϺ9T:OB ?@] \ No newline at end of file diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/bc/ad87f16cdd4fd10adbf9a1976671bad9b0c8aa b/test/integration/mergeConflicts/expected/.git_keep/objects/bc/ad87f16cdd4fd10adbf9a1976671bad9b0c8aa deleted file mode 100644 index 3cf1dac98..000000000 --- a/test/integration/mergeConflicts/expected/.git_keep/objects/bc/ad87f16cdd4fd10adbf9a1976671bad9b0c8aa +++ /dev/null @@ -1,3 +0,0 @@ -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/c2/1e6aeba03d5176c28b213be71d3a02e4966c87 b/test/integration/mergeConflicts/expected/.git_keep/objects/c2/1e6aeba03d5176c28b213be71d3a02e4966c87 deleted file mode 100644 index 518fc5977..000000000 Binary files a/test/integration/mergeConflicts/expected/.git_keep/objects/c2/1e6aeba03d5176c28b213be71d3a02e4966c87 and /dev/null differ diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/c2/8b32178002cb0046454f34e77f3d86391e748d b/test/integration/mergeConflicts/expected/.git_keep/objects/c2/8b32178002cb0046454f34e77f3d86391e748d deleted file mode 100644 index 161eb926a..000000000 --- a/test/integration/mergeConflicts/expected/.git_keep/objects/c2/8b32178002cb0046454f34e77f3d86391e748d +++ /dev/null @@ -1,2 +0,0 @@ -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/c5/507059e2aa65bc2dad65bd38b879079b69c48c b/test/integration/mergeConflicts/expected/.git_keep/objects/c5/507059e2aa65bc2dad65bd38b879079b69c48c new file mode 100644 index 000000000..4737ac8dd Binary files /dev/null and b/test/integration/mergeConflicts/expected/.git_keep/objects/c5/507059e2aa65bc2dad65bd38b879079b69c48c differ diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/ce/0674441b6de3c180f4cf1ff1cdf61cf8d7aa98 b/test/integration/mergeConflicts/expected/.git_keep/objects/ce/0674441b6de3c180f4cf1ff1cdf61cf8d7aa98 deleted file mode 100644 index dfd30d889..000000000 Binary files a/test/integration/mergeConflicts/expected/.git_keep/objects/ce/0674441b6de3c180f4cf1ff1cdf61cf8d7aa98 and /dev/null differ diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/e0/0ef3be7687b4a13bf23199fe9c01767e9b98bc b/test/integration/mergeConflicts/expected/.git_keep/objects/e0/0ef3be7687b4a13bf23199fe9c01767e9b98bc deleted file mode 100644 index e8895a84c..000000000 Binary files a/test/integration/mergeConflicts/expected/.git_keep/objects/e0/0ef3be7687b4a13bf23199fe9c01767e9b98bc and /dev/null differ diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/ee/b8990921f62a1ec3fc0be960c8068a24503ca8 b/test/integration/mergeConflicts/expected/.git_keep/objects/ee/b8990921f62a1ec3fc0be960c8068a24503ca8 new file mode 100644 index 000000000..60935a1f4 Binary files /dev/null and b/test/integration/mergeConflicts/expected/.git_keep/objects/ee/b8990921f62a1ec3fc0be960c8068a24503ca8 differ diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/f0/5cdc6bb7f98285583770bec5a8d307a7805bd6 b/test/integration/mergeConflicts/expected/.git_keep/objects/f0/5cdc6bb7f98285583770bec5a8d307a7805bd6 new file mode 100644 index 000000000..66eeb34ae --- /dev/null +++ b/test/integration/mergeConflicts/expected/.git_keep/objects/f0/5cdc6bb7f98285583770bec5a8d307a7805bd6 @@ -0,0 +1,2 @@ +xM +0F]$I"BW=FLlR"z|+^@VK֥7fp^Qf4)\ 'k7~t(SV9Ii &$T%R(Vga;ΧYO-QJ)v.x}_Q= \ No newline at end of file diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/f2/a15f45b921460e675a8849db39de008b2c03cb b/test/integration/mergeConflicts/expected/.git_keep/objects/f2/a15f45b921460e675a8849db39de008b2c03cb new file mode 100644 index 000000000..53e60ec34 --- /dev/null +++ b/test/integration/mergeConflicts/expected/.git_keep/objects/f2/a15f45b921460e675a8849db39de008b2c03cb @@ -0,0 +1,3 @@ +xK +0@]$N& "̄-5Ƿ>ރWCTD\`C89;0<ԎYH +I$#A_>-pݯ>Tv. ZkvOuS7}7_|A@ \ No newline at end of file diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/fb/d2d93aec237d4e44e44f3647067972c3fa69f5 b/test/integration/mergeConflicts/expected/.git_keep/objects/fb/d2d93aec237d4e44e44f3647067972c3fa69f5 new file mode 100644 index 000000000..73675419e --- /dev/null +++ b/test/integration/mergeConflicts/expected/.git_keep/objects/fb/d2d93aec237d4e44e44f3647067972c3fa69f5 @@ -0,0 +1,2 @@ +xK +0@]dO@DǘdF*X[j/k0DcBԾd}!6%Q%ԅsjM _]RB`H63:rlI٦ea0MzC]蠣OA'{>O]=_&u~> \ 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 deleted file mode 100644 index 422081a4d..000000000 Binary files a/test/integration/mergeConflicts/expected/.git_keep/objects/fd/64b741be226a9fe125acf45a438c089a845fea and /dev/null differ diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/fe/1f8f70f67822120b40d9d704011aec6e17c3a7 b/test/integration/mergeConflicts/expected/.git_keep/objects/fe/1f8f70f67822120b40d9d704011aec6e17c3a7 new file mode 100644 index 000000000..d1205a6da Binary files /dev/null and b/test/integration/mergeConflicts/expected/.git_keep/objects/fe/1f8f70f67822120b40d9d704011aec6e17c3a7 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 0babb4c93..bc3596fef 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 @@ -c28b32178002cb0046454f34e77f3d86391e748d +0539c9baf43fb1939d8f56695ceb08a86e8e1fae diff --git a/test/integration/mergeConflicts/expected/.git_keep/refs/heads/develop b/test/integration/mergeConflicts/expected/.git_keep/refs/heads/develop index 88a6f88c5..f2eaf134c 100644 --- a/test/integration/mergeConflicts/expected/.git_keep/refs/heads/develop +++ b/test/integration/mergeConflicts/expected/.git_keep/refs/heads/develop @@ -1 +1 @@ -51c0794d2dfd4eb71cc06f5e894edd3931411057 +91e16cacdb23b0b5515c6109ea301b0cb6367010 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 d42443ba1..c65182816 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 @@ -7e28009fced47639d5a8b45ec229bcfcc265066a +f05cdc6bb7f98285583770bec5a8d307a7805bd6 diff --git a/test/integration/mergeConflicts/expected/.git_keep/refs/heads/master b/test/integration/mergeConflicts/expected/.git_keep/refs/heads/master index 998aceb22..1b286a9b0 100644 --- a/test/integration/mergeConflicts/expected/.git_keep/refs/heads/master +++ b/test/integration/mergeConflicts/expected/.git_keep/refs/heads/master @@ -1 +1 @@ -258864d877e7897048a0894cad34fad2a5a4c709 +1b3e191104f74b8e4054e22e9ab3b9dcfe299743 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 3c950a997..085978d43 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 @@ -4ea473079cfdf1776e0d7dc114501860b8ab40c4 +32129537d40d9fb35cf3dd6fba7985870142324b diff --git a/test/integration/mergeConflicts/expected/directory/file b/test/integration/mergeConflicts/expected/directory/file index 180cf8328..df6b0d2bc 100644 --- a/test/integration/mergeConflicts/expected/directory/file +++ b/test/integration/mergeConflicts/expected/directory/file @@ -1 +1 @@ -test2 +test3 diff --git a/test/integration/mergeConflicts/expected/directory/file2 b/test/integration/mergeConflicts/expected/directory/file2 index 180cf8328..df6b0d2bc 100644 --- a/test/integration/mergeConflicts/expected/directory/file2 +++ b/test/integration/mergeConflicts/expected/directory/file2 @@ -1 +1 @@ -test2 +test3 diff --git a/test/integration/mergeConflicts/expected/file1 b/test/integration/mergeConflicts/expected/file1 index dcd348507..5d874a902 100644 --- a/test/integration/mergeConflicts/expected/file1 +++ b/test/integration/mergeConflicts/expected/file1 @@ -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 diff --git a/test/integration/mergeConflicts/expected/file3 b/test/integration/mergeConflicts/expected/file3 index 1b9ae5f5d..e3ae5c6d8 100644 --- a/test/integration/mergeConflicts/expected/file3 +++ b/test/integration/mergeConflicts/expected/file3 @@ -1 +1 @@ -once upon a time there was a mouse +once upon a time there was a horse diff --git a/test/integration/mergeConflicts/expected/file4 b/test/integration/mergeConflicts/expected/file4 index e3ae5c6d8..1b9ae5f5d 100644 --- a/test/integration/mergeConflicts/expected/file4 +++ b/test/integration/mergeConflicts/expected/file4 @@ -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 8603b3753..1b9ae5f5d 100644 --- a/test/integration/mergeConflicts/expected/file5 +++ b/test/integration/mergeConflicts/expected/file5 @@ -1,2 +1 @@ -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 a1538ecc8..52b825301 100644 --- a/test/integration/mergeConflicts/recording.json +++ b/test/integration/mergeConflicts/recording.json @@ -1 +1 @@ -[{"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,