From bdf2b2d5c4bfd2da246a3e83bc436004a2aa119d Mon Sep 17 00:00:00 2001 From: Jesse Duffield Date: Fri, 2 Apr 2021 10:28:59 +1100 Subject: [PATCH] add merge conflict undo integration test --- .../expected/.git_keep/COMMIT_EDITMSG | 35 ++++ .../expected/.git_keep/FETCH_HEAD | 0 .../mergeConflictUndo/expected/.git_keep/HEAD | 1 + .../expected/.git_keep/ORIG_HEAD | 1 + .../expected/.git_keep/config | 10 ++ .../expected/.git_keep/description | 1 + .../expected/.git_keep/index | Bin 0 -> 1814 bytes .../expected/.git_keep/info/exclude | 7 + .../expected/.git_keep/logs/HEAD | 34 ++++ .../.git_keep/logs/refs/heads/base_branch | 3 + .../.git_keep/logs/refs/heads/develop | 5 + .../logs/refs/heads/feature/cherry-picking | 9 + .../expected/.git_keep/logs/refs/heads/master | 5 + .../.git_keep/logs/refs/heads/other_branch | 3 + .../08/4111cdf3945cf795dfa651723e7e6a927e48ef | 3 + .../09/cbe8c6717c06a61876b7b641a46a62bf3c585d | Bin 0 -> 112 bytes .../0a/71a0176c3eb0a7ccba7e8e675743aecb362f3a | Bin 0 -> 203 bytes .../17/3a40ed58e33060166ccbfb7d0ccc0387be5f09 | Bin 0 -> 34 bytes .../17/4a8c9444cfa700682d74059d9fa9be5749242c | Bin 0 -> 177 bytes .../18/0cf8328022becee9aaa2577a8f84ea2b9f3827 | Bin 0 -> 21 bytes .../18/f469bc737f6c2a589205e2ddefceb32a7cc3a7 | Bin 0 -> 66 bytes .../1b/9ae5f5dff631baaa180a30afd9983f83dc27ca | Bin 0 -> 50 bytes .../1e/953a069f4b657c300ea0464ecc13f9c2e34905 | 2 + .../20/85c8dd0a80e95ed959e4db2ab98f66b970ad77 | Bin 0 -> 144 bytes .../21/78af7503938665881174069be4d48fa483e4af | Bin 0 -> 117 bytes .../22/b0fd807dd5e428c2d818aef6a2311d7c11e885 | Bin 0 -> 66 bytes .../24/10ee12b940bade9d9e99413732faa6dc60adb1 | Bin 0 -> 34 bytes .../24/6f7487e08e6330ccbec4053e701145d53f64d4 | Bin 0 -> 327 bytes .../27/94411aa7b73b44f533fb862cdb9dbfd13c5d92 | Bin 0 -> 145 bytes .../28/9b2994fdad04740a383797513c39dd183c87d3 | 3 + .../2c/2a4608db50f4c6df0e4580119fd2627d160acd | Bin 0 -> 155 bytes .../2e/cced19ece4424e0d3f26eb3ea2ccb6bfeafaa8 | Bin 0 -> 150 bytes .../32/d15fd4451b6693a93d6420c8af6cfc99348e71 | Bin 0 -> 80 bytes .../34/c74161eef968fc951cf170a011fa8abfeddbcd | Bin 0 -> 120 bytes .../36/d36a1d6a6e1fb7305747cf1cfedac0d3826e3e | Bin 0 -> 155 bytes .../36/e0ef3e52c6e29e64980c71defbab6064d2da8c | Bin 0 -> 252 bytes .../38/08a710b52a152bb73805fe274e0d877cf61800 | 2 + .../4f/80ec0c7b09eeeb580d0c19947477c02bc88c25 | 1 + .../50/573100e1dd69a2a1434e9e63b424946679925e | Bin 0 -> 386 bytes .../58/151e1e14571021b5d38d941538a2e3c3d0e7a9 | Bin 0 -> 165 bytes .../5d/874a902548f753e50944827e572a7470aa9731 | Bin 0 -> 107 bytes .../5d/a4d9200457542d875fe4def54ac98c16332db0 | Bin 0 -> 33 bytes .../5e/9fe3aa0c84eab154f6f8796804b9e2e0ab0401 | 2 + .../5f/3e4598b46a912f0f95a4898743e979343c82f3 | Bin 0 -> 86 bytes .../60/91d709b275e712111d016d9b3a4fb44e63f1f6 | Bin 0 -> 54 bytes .../61/01e935461d4cd862ae4a720846e87880d198b9 | Bin 0 -> 66 bytes .../62/7a99630df8cc12c4acdebac3e3e8af1adf9711 | 2 + .../72/df4fceb0be99deb091ece3f501ef80b39a876a | Bin 0 -> 74 bytes .../78/3666de4acbb22a9efc205197667f5136118c54 | Bin 0 -> 328 bytes .../7d/80e0ed109e6802aa1f23a473200c9af3f8cf61 | Bin 0 -> 154 bytes .../7f/983b882d71782f6520493b14e45b1eb3888a57 | 3 + .../7f/df0429a1e95f38736a260c5ed4121aa5d6e76f | 2 + .../81/46e9924caf0aa2d21db44095ae5a0b0f6e1ce4 | 3 + .../88/9b0fdfe5f2ae3d7df3066f3bc1e181fa712c8d | Bin 0 -> 66 bytes .../88/c39cdc29c995f8e1a63ccd48e7bbd6d96cb8b8 | Bin 0 -> 65 bytes .../8b/7aa507318e42a4efdae2c867d89590bbce48e5 | Bin 0 -> 158 bytes .../90/a84fd62f8033027fab3e567a81d5ed2a6a71cd | Bin 0 -> 66 bytes .../91/65a12a95d3b2b9b8a0374de787af169b2c339e | Bin 0 -> 48 bytes .../95/9d7a10da71acf97b17300b40a3b4f30903e09c | Bin 0 -> 358 bytes .../9d/e8260b738a34a74533df54f2e404276aa96242 | Bin 0 -> 54 bytes .../9e/0b31da5b56c4dd7230a85fee330246c16845ac | Bin 0 -> 158 bytes .../a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 | Bin 0 -> 21 bytes .../ab/172f11e9d1ffc28e53b7c5504f173bf1b27527 | Bin 0 -> 147 bytes .../af/2cd230f86b71f1b77a2b13fd090d88f13575e9 | Bin 0 -> 159 bytes .../af/a76754c933269d7cd45630a7184a20849dbe9c | Bin 0 -> 66 bytes .../b4/121e2d6aa156227b6541431ddfb8594904b520 | Bin 0 -> 66 bytes .../c1/dd146476a4a37fff75b88612a718281ea83b58 | Bin 0 -> 277 bytes .../c4/b40606be30048d61ed9bb55e21ecd612f34d7d | Bin 0 -> 153 bytes .../ca/d08b7e2fbbabb2235cc4ca7785f8ba00247d50 | Bin 0 -> 158 bytes .../d0/60f7226715ca55b04e91fad2b8aca01badd993 | Bin 0 -> 303 bytes .../d8/a7c50dcab42b2b62e5c77cdcece620d3964bd4 | Bin 0 -> 201 bytes .../da/72a6dd6fbaaa4a2803a3c867437ab81a1a99a0 | Bin 0 -> 227 bytes .../db/35d1bf1bfbb57b4b345ee4f6f0554e9e72b015 | Bin 0 -> 121 bytes .../dc/d348507ba1da8f6479b9d964daa302b2fb9d9c | 1 + .../df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b | Bin 0 -> 21 bytes .../e3/ae5c6d8407e8307b9bc77923be78c901408f6e | Bin 0 -> 50 bytes .../e4/48ae5bf6371d80ebee24a22b6df341797a6511 | Bin 0 -> 66 bytes .../e4/666ba294866d5c16f9afebcacf8f4adfee7439 | Bin 0 -> 86 bytes .../e5/03834faae098b6e456c2e2ab921737b3fd957c | 2 + .../ea/a48cb1e3d47e1b8b8df47bdc248e991207cc3d | Bin 0 -> 361 bytes .../eb/90e8d7b137a1d89480c9b22fd03199da77c9c7 | Bin 0 -> 66 bytes .../f1/46c7f7b874778c1ad0cf9aebe45ec2427c7de2 | Bin 0 -> 144 bytes .../f3/f762af4429ae89fa0dae3d0a5b500ca11630c4 | Bin 0 -> 54 bytes .../fd/31cea7e0b6e8d334280be34db8dd86cdda3007 | Bin 0 -> 352 bytes .../expected/.git_keep/refs/heads/base_branch | 1 + .../expected/.git_keep/refs/heads/develop | 1 + .../refs/heads/feature/cherry-picking | 1 + .../expected/.git_keep/refs/heads/master | 1 + .../.git_keep/refs/heads/other_branch | 1 + .../mergeConflictUndo/expected/cherrypicking1 | 1 + .../mergeConflictUndo/expected/cherrypicking2 | 1 + .../mergeConflictUndo/expected/cherrypicking3 | 1 + .../mergeConflictUndo/expected/cherrypicking4 | 1 + .../mergeConflictUndo/expected/cherrypicking5 | 1 + .../mergeConflictUndo/expected/cherrypicking6 | 1 + .../mergeConflictUndo/expected/cherrypicking7 | 1 + .../mergeConflictUndo/expected/cherrypicking8 | 1 + .../mergeConflictUndo/expected/cherrypicking9 | 1 + .../mergeConflictUndo/expected/directory/file | 1 + .../expected/directory/file2 | 1 + .../mergeConflictUndo/expected/file | 1 + .../mergeConflictUndo/expected/file1 | 63 +++++++ .../mergeConflictUndo/expected/file3 | 1 + .../mergeConflictUndo/expected/file4 | 1 + .../mergeConflictUndo/expected/file5 | 1 + .../mergeConflictUndo/recording.json | 1 + test/integration/mergeConflictUndo/setup.sh | 156 ++++++++++++++++++ test/integration/mergeConflictUndo/test.json | 1 + 108 files changed, 381 insertions(+) create mode 100644 test/integration/mergeConflictUndo/expected/.git_keep/COMMIT_EDITMSG create mode 100644 test/integration/mergeConflictUndo/expected/.git_keep/FETCH_HEAD create mode 100644 test/integration/mergeConflictUndo/expected/.git_keep/HEAD create mode 100644 test/integration/mergeConflictUndo/expected/.git_keep/ORIG_HEAD create mode 100644 test/integration/mergeConflictUndo/expected/.git_keep/config create mode 100644 test/integration/mergeConflictUndo/expected/.git_keep/description create mode 100644 test/integration/mergeConflictUndo/expected/.git_keep/index create mode 100644 test/integration/mergeConflictUndo/expected/.git_keep/info/exclude create mode 100644 test/integration/mergeConflictUndo/expected/.git_keep/logs/HEAD create mode 100644 test/integration/mergeConflictUndo/expected/.git_keep/logs/refs/heads/base_branch create mode 100644 test/integration/mergeConflictUndo/expected/.git_keep/logs/refs/heads/develop create mode 100644 test/integration/mergeConflictUndo/expected/.git_keep/logs/refs/heads/feature/cherry-picking create mode 100644 test/integration/mergeConflictUndo/expected/.git_keep/logs/refs/heads/master create mode 100644 test/integration/mergeConflictUndo/expected/.git_keep/logs/refs/heads/other_branch create mode 100644 test/integration/mergeConflictUndo/expected/.git_keep/objects/08/4111cdf3945cf795dfa651723e7e6a927e48ef create mode 100644 test/integration/mergeConflictUndo/expected/.git_keep/objects/09/cbe8c6717c06a61876b7b641a46a62bf3c585d create mode 100644 test/integration/mergeConflictUndo/expected/.git_keep/objects/0a/71a0176c3eb0a7ccba7e8e675743aecb362f3a create mode 100644 test/integration/mergeConflictUndo/expected/.git_keep/objects/17/3a40ed58e33060166ccbfb7d0ccc0387be5f09 create mode 100644 test/integration/mergeConflictUndo/expected/.git_keep/objects/17/4a8c9444cfa700682d74059d9fa9be5749242c create mode 100644 test/integration/mergeConflictUndo/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 create mode 100644 test/integration/mergeConflictUndo/expected/.git_keep/objects/18/f469bc737f6c2a589205e2ddefceb32a7cc3a7 create mode 100644 test/integration/mergeConflictUndo/expected/.git_keep/objects/1b/9ae5f5dff631baaa180a30afd9983f83dc27ca create mode 100644 test/integration/mergeConflictUndo/expected/.git_keep/objects/1e/953a069f4b657c300ea0464ecc13f9c2e34905 create mode 100644 test/integration/mergeConflictUndo/expected/.git_keep/objects/20/85c8dd0a80e95ed959e4db2ab98f66b970ad77 create mode 100644 test/integration/mergeConflictUndo/expected/.git_keep/objects/21/78af7503938665881174069be4d48fa483e4af create mode 100644 test/integration/mergeConflictUndo/expected/.git_keep/objects/22/b0fd807dd5e428c2d818aef6a2311d7c11e885 create mode 100644 test/integration/mergeConflictUndo/expected/.git_keep/objects/24/10ee12b940bade9d9e99413732faa6dc60adb1 create mode 100644 test/integration/mergeConflictUndo/expected/.git_keep/objects/24/6f7487e08e6330ccbec4053e701145d53f64d4 create mode 100644 test/integration/mergeConflictUndo/expected/.git_keep/objects/27/94411aa7b73b44f533fb862cdb9dbfd13c5d92 create mode 100644 test/integration/mergeConflictUndo/expected/.git_keep/objects/28/9b2994fdad04740a383797513c39dd183c87d3 create mode 100644 test/integration/mergeConflictUndo/expected/.git_keep/objects/2c/2a4608db50f4c6df0e4580119fd2627d160acd create mode 100644 test/integration/mergeConflictUndo/expected/.git_keep/objects/2e/cced19ece4424e0d3f26eb3ea2ccb6bfeafaa8 create mode 100644 test/integration/mergeConflictUndo/expected/.git_keep/objects/32/d15fd4451b6693a93d6420c8af6cfc99348e71 create mode 100644 test/integration/mergeConflictUndo/expected/.git_keep/objects/34/c74161eef968fc951cf170a011fa8abfeddbcd create mode 100644 test/integration/mergeConflictUndo/expected/.git_keep/objects/36/d36a1d6a6e1fb7305747cf1cfedac0d3826e3e create mode 100644 test/integration/mergeConflictUndo/expected/.git_keep/objects/36/e0ef3e52c6e29e64980c71defbab6064d2da8c create mode 100644 test/integration/mergeConflictUndo/expected/.git_keep/objects/38/08a710b52a152bb73805fe274e0d877cf61800 create mode 100644 test/integration/mergeConflictUndo/expected/.git_keep/objects/4f/80ec0c7b09eeeb580d0c19947477c02bc88c25 create mode 100644 test/integration/mergeConflictUndo/expected/.git_keep/objects/50/573100e1dd69a2a1434e9e63b424946679925e create mode 100644 test/integration/mergeConflictUndo/expected/.git_keep/objects/58/151e1e14571021b5d38d941538a2e3c3d0e7a9 create mode 100644 test/integration/mergeConflictUndo/expected/.git_keep/objects/5d/874a902548f753e50944827e572a7470aa9731 create mode 100644 test/integration/mergeConflictUndo/expected/.git_keep/objects/5d/a4d9200457542d875fe4def54ac98c16332db0 create mode 100644 test/integration/mergeConflictUndo/expected/.git_keep/objects/5e/9fe3aa0c84eab154f6f8796804b9e2e0ab0401 create mode 100644 test/integration/mergeConflictUndo/expected/.git_keep/objects/5f/3e4598b46a912f0f95a4898743e979343c82f3 create mode 100644 test/integration/mergeConflictUndo/expected/.git_keep/objects/60/91d709b275e712111d016d9b3a4fb44e63f1f6 create mode 100644 test/integration/mergeConflictUndo/expected/.git_keep/objects/61/01e935461d4cd862ae4a720846e87880d198b9 create mode 100644 test/integration/mergeConflictUndo/expected/.git_keep/objects/62/7a99630df8cc12c4acdebac3e3e8af1adf9711 create mode 100644 test/integration/mergeConflictUndo/expected/.git_keep/objects/72/df4fceb0be99deb091ece3f501ef80b39a876a create mode 100644 test/integration/mergeConflictUndo/expected/.git_keep/objects/78/3666de4acbb22a9efc205197667f5136118c54 create mode 100644 test/integration/mergeConflictUndo/expected/.git_keep/objects/7d/80e0ed109e6802aa1f23a473200c9af3f8cf61 create mode 100644 test/integration/mergeConflictUndo/expected/.git_keep/objects/7f/983b882d71782f6520493b14e45b1eb3888a57 create mode 100644 test/integration/mergeConflictUndo/expected/.git_keep/objects/7f/df0429a1e95f38736a260c5ed4121aa5d6e76f create mode 100644 test/integration/mergeConflictUndo/expected/.git_keep/objects/81/46e9924caf0aa2d21db44095ae5a0b0f6e1ce4 create mode 100644 test/integration/mergeConflictUndo/expected/.git_keep/objects/88/9b0fdfe5f2ae3d7df3066f3bc1e181fa712c8d create mode 100644 test/integration/mergeConflictUndo/expected/.git_keep/objects/88/c39cdc29c995f8e1a63ccd48e7bbd6d96cb8b8 create mode 100644 test/integration/mergeConflictUndo/expected/.git_keep/objects/8b/7aa507318e42a4efdae2c867d89590bbce48e5 create mode 100644 test/integration/mergeConflictUndo/expected/.git_keep/objects/90/a84fd62f8033027fab3e567a81d5ed2a6a71cd create mode 100644 test/integration/mergeConflictUndo/expected/.git_keep/objects/91/65a12a95d3b2b9b8a0374de787af169b2c339e create mode 100644 test/integration/mergeConflictUndo/expected/.git_keep/objects/95/9d7a10da71acf97b17300b40a3b4f30903e09c create mode 100644 test/integration/mergeConflictUndo/expected/.git_keep/objects/9d/e8260b738a34a74533df54f2e404276aa96242 create mode 100644 test/integration/mergeConflictUndo/expected/.git_keep/objects/9e/0b31da5b56c4dd7230a85fee330246c16845ac create mode 100644 test/integration/mergeConflictUndo/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 create mode 100644 test/integration/mergeConflictUndo/expected/.git_keep/objects/ab/172f11e9d1ffc28e53b7c5504f173bf1b27527 create mode 100644 test/integration/mergeConflictUndo/expected/.git_keep/objects/af/2cd230f86b71f1b77a2b13fd090d88f13575e9 create mode 100644 test/integration/mergeConflictUndo/expected/.git_keep/objects/af/a76754c933269d7cd45630a7184a20849dbe9c create mode 100644 test/integration/mergeConflictUndo/expected/.git_keep/objects/b4/121e2d6aa156227b6541431ddfb8594904b520 create mode 100644 test/integration/mergeConflictUndo/expected/.git_keep/objects/c1/dd146476a4a37fff75b88612a718281ea83b58 create mode 100644 test/integration/mergeConflictUndo/expected/.git_keep/objects/c4/b40606be30048d61ed9bb55e21ecd612f34d7d create mode 100644 test/integration/mergeConflictUndo/expected/.git_keep/objects/ca/d08b7e2fbbabb2235cc4ca7785f8ba00247d50 create mode 100644 test/integration/mergeConflictUndo/expected/.git_keep/objects/d0/60f7226715ca55b04e91fad2b8aca01badd993 create mode 100644 test/integration/mergeConflictUndo/expected/.git_keep/objects/d8/a7c50dcab42b2b62e5c77cdcece620d3964bd4 create mode 100644 test/integration/mergeConflictUndo/expected/.git_keep/objects/da/72a6dd6fbaaa4a2803a3c867437ab81a1a99a0 create mode 100644 test/integration/mergeConflictUndo/expected/.git_keep/objects/db/35d1bf1bfbb57b4b345ee4f6f0554e9e72b015 create mode 100644 test/integration/mergeConflictUndo/expected/.git_keep/objects/dc/d348507ba1da8f6479b9d964daa302b2fb9d9c create mode 100644 test/integration/mergeConflictUndo/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b create mode 100644 test/integration/mergeConflictUndo/expected/.git_keep/objects/e3/ae5c6d8407e8307b9bc77923be78c901408f6e create mode 100644 test/integration/mergeConflictUndo/expected/.git_keep/objects/e4/48ae5bf6371d80ebee24a22b6df341797a6511 create mode 100644 test/integration/mergeConflictUndo/expected/.git_keep/objects/e4/666ba294866d5c16f9afebcacf8f4adfee7439 create mode 100644 test/integration/mergeConflictUndo/expected/.git_keep/objects/e5/03834faae098b6e456c2e2ab921737b3fd957c create mode 100644 test/integration/mergeConflictUndo/expected/.git_keep/objects/ea/a48cb1e3d47e1b8b8df47bdc248e991207cc3d create mode 100644 test/integration/mergeConflictUndo/expected/.git_keep/objects/eb/90e8d7b137a1d89480c9b22fd03199da77c9c7 create mode 100644 test/integration/mergeConflictUndo/expected/.git_keep/objects/f1/46c7f7b874778c1ad0cf9aebe45ec2427c7de2 create mode 100644 test/integration/mergeConflictUndo/expected/.git_keep/objects/f3/f762af4429ae89fa0dae3d0a5b500ca11630c4 create mode 100644 test/integration/mergeConflictUndo/expected/.git_keep/objects/fd/31cea7e0b6e8d334280be34db8dd86cdda3007 create mode 100644 test/integration/mergeConflictUndo/expected/.git_keep/refs/heads/base_branch create mode 100644 test/integration/mergeConflictUndo/expected/.git_keep/refs/heads/develop create mode 100644 test/integration/mergeConflictUndo/expected/.git_keep/refs/heads/feature/cherry-picking create mode 100644 test/integration/mergeConflictUndo/expected/.git_keep/refs/heads/master create mode 100644 test/integration/mergeConflictUndo/expected/.git_keep/refs/heads/other_branch create mode 100644 test/integration/mergeConflictUndo/expected/cherrypicking1 create mode 100644 test/integration/mergeConflictUndo/expected/cherrypicking2 create mode 100644 test/integration/mergeConflictUndo/expected/cherrypicking3 create mode 100644 test/integration/mergeConflictUndo/expected/cherrypicking4 create mode 100644 test/integration/mergeConflictUndo/expected/cherrypicking5 create mode 100644 test/integration/mergeConflictUndo/expected/cherrypicking6 create mode 100644 test/integration/mergeConflictUndo/expected/cherrypicking7 create mode 100644 test/integration/mergeConflictUndo/expected/cherrypicking8 create mode 100644 test/integration/mergeConflictUndo/expected/cherrypicking9 create mode 100644 test/integration/mergeConflictUndo/expected/directory/file create mode 100644 test/integration/mergeConflictUndo/expected/directory/file2 create mode 100644 test/integration/mergeConflictUndo/expected/file create mode 100644 test/integration/mergeConflictUndo/expected/file1 create mode 100644 test/integration/mergeConflictUndo/expected/file3 create mode 100644 test/integration/mergeConflictUndo/expected/file4 create mode 100644 test/integration/mergeConflictUndo/expected/file5 create mode 100644 test/integration/mergeConflictUndo/recording.json create mode 100644 test/integration/mergeConflictUndo/setup.sh create mode 100644 test/integration/mergeConflictUndo/test.json diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/COMMIT_EDITMSG b/test/integration/mergeConflictUndo/expected/.git_keep/COMMIT_EDITMSG new file mode 100644 index 000000000..976d36736 --- /dev/null +++ b/test/integration/mergeConflictUndo/expected/.git_keep/COMMIT_EDITMSG @@ -0,0 +1,35 @@ +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/mergeConflictUndo/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: directory/file +# modified: file1 +# diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/FETCH_HEAD b/test/integration/mergeConflictUndo/expected/.git_keep/FETCH_HEAD new file mode 100644 index 000000000..e69de29bb diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/HEAD b/test/integration/mergeConflictUndo/expected/.git_keep/HEAD new file mode 100644 index 000000000..904a2e296 --- /dev/null +++ b/test/integration/mergeConflictUndo/expected/.git_keep/HEAD @@ -0,0 +1 @@ +ref: refs/heads/other_branch diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/ORIG_HEAD b/test/integration/mergeConflictUndo/expected/.git_keep/ORIG_HEAD new file mode 100644 index 000000000..c39f90780 --- /dev/null +++ b/test/integration/mergeConflictUndo/expected/.git_keep/ORIG_HEAD @@ -0,0 +1 @@ +ab172f11e9d1ffc28e53b7c5504f173bf1b27527 diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/config b/test/integration/mergeConflictUndo/expected/.git_keep/config new file mode 100644 index 000000000..8ae104545 --- /dev/null +++ b/test/integration/mergeConflictUndo/expected/.git_keep/config @@ -0,0 +1,10 @@ +[core] + repositoryformatversion = 0 + filemode = true + bare = false + logallrefupdates = true + ignorecase = true + precomposeunicode = true +[user] + email = CI@example.com + name = CI diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/description b/test/integration/mergeConflictUndo/expected/.git_keep/description new file mode 100644 index 000000000..498b267a8 --- /dev/null +++ b/test/integration/mergeConflictUndo/expected/.git_keep/description @@ -0,0 +1 @@ +Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/index b/test/integration/mergeConflictUndo/expected/.git_keep/index new file mode 100644 index 0000000000000000000000000000000000000000..680aeaeee29c8d245c890cf0b69b9082704a8712 GIT binary patch literal 1814 zcmbuuox}{JLJPT@ERV(Rcv{ zqbSuBITT|7MFVK?OteOc7YYQeoEAYy4Fc=e=FIS{48R zuz<^9TXd*)rZlPElpFvotz2$=1t2vK08Ss=GYu}$c22v`D&CsfNS#Dwy~=n<{q|x7 zu#@jps8sY`rF@ri&khRi1IUrxqfLpuM$$WR+1}9lQ@13!$0}~|3o2NQeEq*pe@XQ>~z z#9k}uaeI{y_NT;pgr6JV^trqGjz`kdLc;T9y~xF`$b*T!HqvVe(rxM&^VA((uDPDO zd;IAH#bm-0vz~$%fjpSl`$l>h*QFo5)ZP{;Hg1Z1*-vV@y8c{>mo(XUjPMp>@0weC<_hSc#NH6$S#fO#glgxi>h_}Cu!Quq z@19o|xC6T=rAi@>k5kcJ(aKl__VPq!LOJwMVsDW247(Y5$V{#N9z6on86N z5!jo1OhZFQGbg1f*_7COL3oa?4qa0!mREk!T*>wq3x^6Cw%sZPmZqwZb8Fnm{6)|~ ziJe|^hZDQ`xFo|Z=-0Z|i7SsB4)ciLTXcZ};~58yD^pML{LItCro>LSxdU99brHMM zCKv^Ym!H!vRfqJP<>`Ay95hypQ!?HE596T3PS@BSG)~A7J89b(he_=G7`ubU2&|U{ z2Exzn2Pj`YWfL4mfyU3uTy4PGEAleetZ4e&7WQs{kT0-N8Kl)ERoP!kGCQ05INjsO=38*=QTL;!Ut5?NrTZJuzC}nfpRQ z#_#!`7mQrDdBOPU#M7LHIr{ShjRk(MgTCGWSQlGf-taysI8j@l9z|EwMb%%kxcys` zBUN|WCQj_?2%ls-BP;&kBhMG7-5Ayz2#9(|>lDXJt$l`msOx literal 0 HcmV?d00001 diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/info/exclude b/test/integration/mergeConflictUndo/expected/.git_keep/info/exclude new file mode 100644 index 000000000..8e9f2071f --- /dev/null +++ b/test/integration/mergeConflictUndo/expected/.git_keep/info/exclude @@ -0,0 +1,7 @@ +# git ls-files --others --exclude-from=.git/info/exclude +# Lines that start with '#' are comments. +# For a project mostly in C, the following would be a good set of +# exclude patterns (uncomment them if you want to use them): +# *.[oa] +# *~ +.DS_Store diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/logs/HEAD b/test/integration/mergeConflictUndo/expected/.git_keep/logs/HEAD new file mode 100644 index 000000000..c185b357c --- /dev/null +++ b/test/integration/mergeConflictUndo/expected/.git_keep/logs/HEAD @@ -0,0 +1,34 @@ +0000000000000000000000000000000000000000 db35d1bf1bfbb57b4b345ee4f6f0554e9e72b015 CI 1617319581 +1100 commit (initial): first commit +db35d1bf1bfbb57b4b345ee4f6f0554e9e72b015 db35d1bf1bfbb57b4b345ee4f6f0554e9e72b015 CI 1617319581 +1100 checkout: moving from master to feature/cherry-picking +db35d1bf1bfbb57b4b345ee4f6f0554e9e72b015 1e953a069f4b657c300ea0464ecc13f9c2e34905 CI 1617319581 +1100 commit: first commit freshman year +1e953a069f4b657c300ea0464ecc13f9c2e34905 58151e1e14571021b5d38d941538a2e3c3d0e7a9 CI 1617319581 +1100 commit: second commit subway eat fresh +58151e1e14571021b5d38d941538a2e3c3d0e7a9 289b2994fdad04740a383797513c39dd183c87d3 CI 1617319581 +1100 commit: third commit fresh +289b2994fdad04740a383797513c39dd183c87d3 36d36a1d6a6e1fb7305747cf1cfedac0d3826e3e CI 1617319581 +1100 commit: fourth commit cool +36d36a1d6a6e1fb7305747cf1cfedac0d3826e3e 7f983b882d71782f6520493b14e45b1eb3888a57 CI 1617319581 +1100 commit: fifth commit nice +7f983b882d71782f6520493b14e45b1eb3888a57 8146e9924caf0aa2d21db44095ae5a0b0f6e1ce4 CI 1617319581 +1100 commit: sixth commit haha +8146e9924caf0aa2d21db44095ae5a0b0f6e1ce4 2c2a4608db50f4c6df0e4580119fd2627d160acd CI 1617319581 +1100 commit: seventh commit yeah +2c2a4608db50f4c6df0e4580119fd2627d160acd 7d80e0ed109e6802aa1f23a473200c9af3f8cf61 CI 1617319581 +1100 commit: eighth commit woo +7d80e0ed109e6802aa1f23a473200c9af3f8cf61 7d80e0ed109e6802aa1f23a473200c9af3f8cf61 CI 1617319581 +1100 checkout: moving from feature/cherry-picking to develop +7d80e0ed109e6802aa1f23a473200c9af3f8cf61 e503834faae098b6e456c2e2ab921737b3fd957c CI 1617319581 +1100 commit: first commit on develop +e503834faae098b6e456c2e2ab921737b3fd957c db35d1bf1bfbb57b4b345ee4f6f0554e9e72b015 CI 1617319581 +1100 checkout: moving from develop to master +db35d1bf1bfbb57b4b345ee4f6f0554e9e72b015 cad08b7e2fbbabb2235cc4ca7785f8ba00247d50 CI 1617319581 +1100 commit: first commit on master +cad08b7e2fbbabb2235cc4ca7785f8ba00247d50 e503834faae098b6e456c2e2ab921737b3fd957c CI 1617319581 +1100 checkout: moving from master to develop +e503834faae098b6e456c2e2ab921737b3fd957c 9e0b31da5b56c4dd7230a85fee330246c16845ac CI 1617319581 +1100 commit: second commit on develop +9e0b31da5b56c4dd7230a85fee330246c16845ac cad08b7e2fbbabb2235cc4ca7785f8ba00247d50 CI 1617319581 +1100 checkout: moving from develop to master +cad08b7e2fbbabb2235cc4ca7785f8ba00247d50 af2cd230f86b71f1b77a2b13fd090d88f13575e9 CI 1617319581 +1100 commit: second commit on master +af2cd230f86b71f1b77a2b13fd090d88f13575e9 9e0b31da5b56c4dd7230a85fee330246c16845ac CI 1617319581 +1100 checkout: moving from master to develop +9e0b31da5b56c4dd7230a85fee330246c16845ac 084111cdf3945cf795dfa651723e7e6a927e48ef CI 1617319581 +1100 commit: third commit on develop +084111cdf3945cf795dfa651723e7e6a927e48ef af2cd230f86b71f1b77a2b13fd090d88f13575e9 CI 1617319581 +1100 checkout: moving from develop to master +af2cd230f86b71f1b77a2b13fd090d88f13575e9 627a99630df8cc12c4acdebac3e3e8af1adf9711 CI 1617319581 +1100 commit: third commit on master +627a99630df8cc12c4acdebac3e3e8af1adf9711 084111cdf3945cf795dfa651723e7e6a927e48ef CI 1617319581 +1100 checkout: moving from master to develop +084111cdf3945cf795dfa651723e7e6a927e48ef 8b7aa507318e42a4efdae2c867d89590bbce48e5 CI 1617319581 +1100 commit: fourth commit on develop +8b7aa507318e42a4efdae2c867d89590bbce48e5 627a99630df8cc12c4acdebac3e3e8af1adf9711 CI 1617319581 +1100 checkout: moving from develop to master +627a99630df8cc12c4acdebac3e3e8af1adf9711 5e9fe3aa0c84eab154f6f8796804b9e2e0ab0401 CI 1617319581 +1100 commit: fourth commit on master +5e9fe3aa0c84eab154f6f8796804b9e2e0ab0401 5e9fe3aa0c84eab154f6f8796804b9e2e0ab0401 CI 1617319581 +1100 checkout: moving from master to base_branch +5e9fe3aa0c84eab154f6f8796804b9e2e0ab0401 7fdf0429a1e95f38736a260c5ed4121aa5d6e76f CI 1617319581 +1100 commit: file +7fdf0429a1e95f38736a260c5ed4121aa5d6e76f 7fdf0429a1e95f38736a260c5ed4121aa5d6e76f CI 1617319581 +1100 checkout: moving from base_branch to other_branch +7fdf0429a1e95f38736a260c5ed4121aa5d6e76f 7fdf0429a1e95f38736a260c5ed4121aa5d6e76f CI 1617319581 +1100 checkout: moving from other_branch to base_branch +7fdf0429a1e95f38736a260c5ed4121aa5d6e76f c4b40606be30048d61ed9bb55e21ecd612f34d7d CI 1617319581 +1100 commit: file changed +c4b40606be30048d61ed9bb55e21ecd612f34d7d 7fdf0429a1e95f38736a260c5ed4121aa5d6e76f CI 1617319581 +1100 checkout: moving from base_branch to other_branch +7fdf0429a1e95f38736a260c5ed4121aa5d6e76f ab172f11e9d1ffc28e53b7c5504f173bf1b27527 CI 1617319582 +1100 commit: asd +ab172f11e9d1ffc28e53b7c5504f173bf1b27527 0a71a0176c3eb0a7ccba7e8e675743aecb362f3a CI 1617319602 +1100 commit (merge): Merge branch 'develop' into other_branch diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/logs/refs/heads/base_branch b/test/integration/mergeConflictUndo/expected/.git_keep/logs/refs/heads/base_branch new file mode 100644 index 000000000..64af6934b --- /dev/null +++ b/test/integration/mergeConflictUndo/expected/.git_keep/logs/refs/heads/base_branch @@ -0,0 +1,3 @@ +0000000000000000000000000000000000000000 5e9fe3aa0c84eab154f6f8796804b9e2e0ab0401 CI 1617319581 +1100 branch: Created from HEAD +5e9fe3aa0c84eab154f6f8796804b9e2e0ab0401 7fdf0429a1e95f38736a260c5ed4121aa5d6e76f CI 1617319581 +1100 commit: file +7fdf0429a1e95f38736a260c5ed4121aa5d6e76f c4b40606be30048d61ed9bb55e21ecd612f34d7d CI 1617319581 +1100 commit: file changed diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/logs/refs/heads/develop b/test/integration/mergeConflictUndo/expected/.git_keep/logs/refs/heads/develop new file mode 100644 index 000000000..abb04bbd5 --- /dev/null +++ b/test/integration/mergeConflictUndo/expected/.git_keep/logs/refs/heads/develop @@ -0,0 +1,5 @@ +0000000000000000000000000000000000000000 7d80e0ed109e6802aa1f23a473200c9af3f8cf61 CI 1617319581 +1100 branch: Created from HEAD +7d80e0ed109e6802aa1f23a473200c9af3f8cf61 e503834faae098b6e456c2e2ab921737b3fd957c CI 1617319581 +1100 commit: first commit on develop +e503834faae098b6e456c2e2ab921737b3fd957c 9e0b31da5b56c4dd7230a85fee330246c16845ac CI 1617319581 +1100 commit: second commit on develop +9e0b31da5b56c4dd7230a85fee330246c16845ac 084111cdf3945cf795dfa651723e7e6a927e48ef CI 1617319581 +1100 commit: third commit on develop +084111cdf3945cf795dfa651723e7e6a927e48ef 8b7aa507318e42a4efdae2c867d89590bbce48e5 CI 1617319581 +1100 commit: fourth commit on develop diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/logs/refs/heads/feature/cherry-picking b/test/integration/mergeConflictUndo/expected/.git_keep/logs/refs/heads/feature/cherry-picking new file mode 100644 index 000000000..2b11e74e4 --- /dev/null +++ b/test/integration/mergeConflictUndo/expected/.git_keep/logs/refs/heads/feature/cherry-picking @@ -0,0 +1,9 @@ +0000000000000000000000000000000000000000 db35d1bf1bfbb57b4b345ee4f6f0554e9e72b015 CI 1617319581 +1100 branch: Created from HEAD +db35d1bf1bfbb57b4b345ee4f6f0554e9e72b015 1e953a069f4b657c300ea0464ecc13f9c2e34905 CI 1617319581 +1100 commit: first commit freshman year +1e953a069f4b657c300ea0464ecc13f9c2e34905 58151e1e14571021b5d38d941538a2e3c3d0e7a9 CI 1617319581 +1100 commit: second commit subway eat fresh +58151e1e14571021b5d38d941538a2e3c3d0e7a9 289b2994fdad04740a383797513c39dd183c87d3 CI 1617319581 +1100 commit: third commit fresh +289b2994fdad04740a383797513c39dd183c87d3 36d36a1d6a6e1fb7305747cf1cfedac0d3826e3e CI 1617319581 +1100 commit: fourth commit cool +36d36a1d6a6e1fb7305747cf1cfedac0d3826e3e 7f983b882d71782f6520493b14e45b1eb3888a57 CI 1617319581 +1100 commit: fifth commit nice +7f983b882d71782f6520493b14e45b1eb3888a57 8146e9924caf0aa2d21db44095ae5a0b0f6e1ce4 CI 1617319581 +1100 commit: sixth commit haha +8146e9924caf0aa2d21db44095ae5a0b0f6e1ce4 2c2a4608db50f4c6df0e4580119fd2627d160acd CI 1617319581 +1100 commit: seventh commit yeah +2c2a4608db50f4c6df0e4580119fd2627d160acd 7d80e0ed109e6802aa1f23a473200c9af3f8cf61 CI 1617319581 +1100 commit: eighth commit woo diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/logs/refs/heads/master b/test/integration/mergeConflictUndo/expected/.git_keep/logs/refs/heads/master new file mode 100644 index 000000000..5959f88c3 --- /dev/null +++ b/test/integration/mergeConflictUndo/expected/.git_keep/logs/refs/heads/master @@ -0,0 +1,5 @@ +0000000000000000000000000000000000000000 db35d1bf1bfbb57b4b345ee4f6f0554e9e72b015 CI 1617319581 +1100 commit (initial): first commit +db35d1bf1bfbb57b4b345ee4f6f0554e9e72b015 cad08b7e2fbbabb2235cc4ca7785f8ba00247d50 CI 1617319581 +1100 commit: first commit on master +cad08b7e2fbbabb2235cc4ca7785f8ba00247d50 af2cd230f86b71f1b77a2b13fd090d88f13575e9 CI 1617319581 +1100 commit: second commit on master +af2cd230f86b71f1b77a2b13fd090d88f13575e9 627a99630df8cc12c4acdebac3e3e8af1adf9711 CI 1617319581 +1100 commit: third commit on master +627a99630df8cc12c4acdebac3e3e8af1adf9711 5e9fe3aa0c84eab154f6f8796804b9e2e0ab0401 CI 1617319581 +1100 commit: fourth commit on master diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/logs/refs/heads/other_branch b/test/integration/mergeConflictUndo/expected/.git_keep/logs/refs/heads/other_branch new file mode 100644 index 000000000..1258a9d63 --- /dev/null +++ b/test/integration/mergeConflictUndo/expected/.git_keep/logs/refs/heads/other_branch @@ -0,0 +1,3 @@ +0000000000000000000000000000000000000000 7fdf0429a1e95f38736a260c5ed4121aa5d6e76f CI 1617319581 +1100 branch: Created from HEAD +7fdf0429a1e95f38736a260c5ed4121aa5d6e76f ab172f11e9d1ffc28e53b7c5504f173bf1b27527 CI 1617319582 +1100 commit: asd +ab172f11e9d1ffc28e53b7c5504f173bf1b27527 0a71a0176c3eb0a7ccba7e8e675743aecb362f3a CI 1617319602 +1100 commit (merge): Merge branch 'develop' into other_branch diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/08/4111cdf3945cf795dfa651723e7e6a927e48ef b/test/integration/mergeConflictUndo/expected/.git_keep/objects/08/4111cdf3945cf795dfa651723e7e6a927e48ef new file mode 100644 index 000000000..4f28207f2 --- /dev/null +++ b/test/integration/mergeConflictUndo/expected/.git_keep/objects/08/4111cdf3945cf795dfa651723e7e6a927e48ef @@ -0,0 +1,3 @@ +xM +0F]dk@Dǘ$SZhx| ^{/m[tVE ؐ=fi +>׈ h&`H*{ 5eѺdrF$5v%r\* #܇)ގUnl w6(؞J7Fk&z<00M=S%%arflKi4dhR@%V*1Kq~>-@#L&Xy}WfM=nY z!4X3P12Yp7g|y6^R6~Y4mpuZi7vAbmsoZ%p<PK~iAM@OWKJZVUShgX-DG SE0y;F6gC_H literal 0 HcmV?d00001 diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/0a/71a0176c3eb0a7ccba7e8e675743aecb362f3a b/test/integration/mergeConflictUndo/expected/.git_keep/objects/0a/71a0176c3eb0a7ccba7e8e675743aecb362f3a new file mode 100644 index 0000000000000000000000000000000000000000..c7eb67d1698849e34a1e2b6a39414b880dffc272 GIT binary patch literal 203 zcmV;+05t!20gaE%Y6CG4gL~emm|G5o;_>=t4W$%v%AwCt##vLmt0|(tEFx z_#~yeZP!lP+o#?Dvda3Il>+DNf@ong8w9vH8f}7c&WE5arb8O`P7>Mc!i1{Gt18IVc7`&t{FFZ6o8yyGF; zal=ch+Z(YPWDZVgdgifp8tORF@z415f%XN8P4=|XDdUb?Jx+Apd!^b}w9j8}`T<{) FQ#Zq2X?p+w literal 0 HcmV?d00001 diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/17/3a40ed58e33060166ccbfb7d0ccc0387be5f09 b/test/integration/mergeConflictUndo/expected/.git_keep/objects/17/3a40ed58e33060166ccbfb7d0ccc0387be5f09 new file mode 100644 index 0000000000000000000000000000000000000000..25389c9d662fa3c7c7b5b9b2c4a41240d70f394f GIT binary patch literal 34 qcmbL%-RBWayi z5r^B0iiV3bc4AX$#LzLD|NhfY>uhU3v*lYKeAxJ_P^TB0N@IrC6JA{3Xuj~ql!lX= z^e-6Byj6bkxQPJ}D5PW-r6!l;7gaJOOuWvysr0#!pe$qVY%BjQe#sxdK}}1`%t~ZE#08nZNMgRZ+ literal 0 HcmV?d00001 diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/18/f469bc737f6c2a589205e2ddefceb32a7cc3a7 b/test/integration/mergeConflictUndo/expected/.git_keep/objects/18/f469bc737f6c2a589205e2ddefceb32a7cc3a7 new file mode 100644 index 0000000000000000000000000000000000000000..9b8af5fe783f2a13adddbc268c1af837ab15412a GIT binary patch literal 66 zcmV-I0KNZs0ZYosPf{>7VkpVTELH%bw9K4Tg}l<-q|_n>Gli0j#1aKh^<0JY{LH*` Yg_3-Q7nZts^PE0#`Wacbg|_{j0{$> Gd}ROuKoaKw literal 0 HcmV?d00001 diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/1e/953a069f4b657c300ea0464ecc13f9c2e34905 b/test/integration/mergeConflictUndo/expected/.git_keep/objects/1e/953a069f4b657c300ea0464ecc13f9c2e34905 new file mode 100644 index 000000000..7a43582ea --- /dev/null +++ b/test/integration/mergeConflictUndo/expected/.git_keep/objects/1e/953a069f4b657c300ea0464ecc13f9c2e34905 @@ -0,0 +1,2 @@ +x +0E]+f/H&ւટ1P#[:7-9VrH HgA=ĥfH9U*&qbTcA}@]1 ZF^m^*]G:] R;i)g{C<2홭5N5|Frs./C \ No newline at end of file diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/20/85c8dd0a80e95ed959e4db2ab98f66b970ad77 b/test/integration/mergeConflictUndo/expected/.git_keep/objects/20/85c8dd0a80e95ed959e4db2ab98f66b970ad77 new file mode 100644 index 0000000000000000000000000000000000000000..1cafb95f9172da116f05816fbf223f92099aebbf GIT binary patch literal 144 zcmV;B0B`?z0V^p=O;s>5Fkmn-00M=S%%arflKi4dhR@%V*1Kq~>-@#L&Xy}WfM=nY z!4X3P12Yp7g|y6^REF3kHx*dILv-8YpWOTEb+SjySa$=GydlG#%N_yM3vczORPMZ) ya%(Zurr&etASp0rc)Ttqw}t(MLG|q8mCE}nPBJ?5=OHODA*8?*s{#O;Tv8UZnMM@= literal 0 HcmV?d00001 diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/21/78af7503938665881174069be4d48fa483e4af b/test/integration/mergeConflictUndo/expected/.git_keep/objects/21/78af7503938665881174069be4d48fa483e4af new file mode 100644 index 0000000000000000000000000000000000000000..27c11bb26067e0a43b68d14777da3f61ddfcceac GIT binary patch literal 117 zcmV-*0E+*30V^p=O;s>7Hf1m|00M=S%%arflKi4dhR@%V*1Kq~>-@#L&Xy}WfM=nY z!4X3P12Yp7g|y6^R6~Y4mpuZi7vAbmsoZ%p<PK~iAM@OWKJZVUShgX-DG XE0yi+kh=VyFxv@AV literal 0 HcmV?d00001 diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/22/b0fd807dd5e428c2d818aef6a2311d7c11e885 b/test/integration/mergeConflictUndo/expected/.git_keep/objects/22/b0fd807dd5e428c2d818aef6a2311d7c11e885 new file mode 100644 index 0000000000000000000000000000000000000000..99177464395aa927a36557643ce3e4e536679578 GIT binary patch literal 66 zcmV-I0KNZs0ZYosPf{>7VkpVTELH%bw9K4Tg}l<-q|_n>ONEk*#1aKh^<0JY{LH*` Yg_3-Q4F=sF|FfcPQQAo~6Eh?%k$V|@8%u6?9NMw9z>L%-RBWayi z5r^B0iiV3bc4AX$#LzLD|NhfY>uhU3v*lYKeAxJ_P^TB0N@IrC6JA{3Xuj~ql!lX= z^e-6Byj6bkI5w3g3|oZcbh8$QDOIOBI?LYQ5$VaYRRNnyQ-<}+(?d=gtIe&s5@xVm z!b_oL?!GzLRGKkJe97EXT%V&AF^Toj-S_73x)|R{IBUZ7&FzcwhOCjy!uuvtMDu~m6i-j8~!%bUVWl*=!V3)Z;K3N zYXo1kniv3qLP};)YH~?_Q65Fkmn-00M=S%%arflKi4dhR@%V*1Kq~>-@#L&Xy}WfM=nY z!4X3P12Yp7g|y6^R0b7+cS1WIcHNshZ>FQU(XVB964q`+k~d_ybJ-)Hdf~19l**kq zQ*JG0+Vp$w93%zC43F2v \ No newline at end of file diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/2c/2a4608db50f4c6df0e4580119fd2627d160acd b/test/integration/mergeConflictUndo/expected/.git_keep/objects/2c/2a4608db50f4c6df0e4580119fd2627d160acd new file mode 100644 index 0000000000000000000000000000000000000000..fe5c7b62d4423c85e1694d2de98cf9a14c796f71 GIT binary patch literal 155 zcmV;M0A&Ao0gaA93c@fD06pgwdlzIkP0}ui2tE0XO|qeav86`Q-&^nlUWXZ&G}n4< zU@`34stOqcmfqUXlTYG(M5jzevWs#t_(?go;2`EtC5&MB)PlRYTx=l6xQ#TKNZ7&o2I{2te J<_rBSKZ`s)N3Q?? literal 0 HcmV?d00001 diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/2e/cced19ece4424e0d3f26eb3ea2ccb6bfeafaa8 b/test/integration/mergeConflictUndo/expected/.git_keep/objects/2e/cced19ece4424e0d3f26eb3ea2ccb6bfeafaa8 new file mode 100644 index 0000000000000000000000000000000000000000..ed74cea0ac22b5cf303dbcf79e5b7208e6720d90 GIT binary patch literal 150 zcmV;H0BQet0V^p=O;s>7HD)k0FfcPQQAo~6Eh?%k$V|@8%u6?9NMw9z>L%-RBWayi z5r^B0iiV3bc4AX$#LzLD|NhfY>uhU3v*lYKeAxJ_P^Z_#006FlVrV00j?MM;EUAyyR4c(t`Xvg+zst%-mFkl8n@%RE6@y mVxT}qeo=8Mmn{U~SDKq&3RG$b0SYOpWvMy&1zZ3SiX=>?Kq37A literal 0 HcmV?d00001 diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/34/c74161eef968fc951cf170a011fa8abfeddbcd b/test/integration/mergeConflictUndo/expected/.git_keep/objects/34/c74161eef968fc951cf170a011fa8abfeddbcd new file mode 100644 index 0000000000000000000000000000000000000000..e8d63bced5a790cf612ba77d98cf03e888d91233 GIT binary patch literal 120 zcmV-;0Ehp00V^p=O;s>7vtTeW00M=S%%arflKi4dhR@%V*1Kq~>-@#L&Xy}WfM=nY z!4X3P12Yp7g|y6^R6~Y4mpuZi7vAbmsoZ%p<PK~iAM@OWKJZVUShgX-DG aE0yk{ZN7k6)n|=<37gKlrii z`>SbdhD)nC>m+2wr{tGeM4Z@QP%s8h4oT(!0>Ugt9a8hV!@#p;c1x0E962KxkeCL* zh@29Hjwzv%v#q7-ankp3dghPp$Chug><TN&O@}G0Hl(V)~|5%T* JsV{dXK4L2aOA-J8 literal 0 HcmV?d00001 diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/36/e0ef3e52c6e29e64980c71defbab6064d2da8c b/test/integration/mergeConflictUndo/expected/.git_keep/objects/36/e0ef3e52c6e29e64980c71defbab6064d2da8c new file mode 100644 index 0000000000000000000000000000000000000000..394c5a2944bf36c1c25fa0709e723b9a7cac0348 GIT binary patch literal 252 zcmV9GGs6`FfcPQQAo~6Eh?%k$V|@8%u6?9NMw9z>L%-RBWayi z5r^B0iiV3bc4AX$#LzLD|NhfY>uhU3v*lYKeAxJ_P^TB0N@IrC6JA{3Xuj~ql!lX= z^e-6Byj6bkI5w3g3|oZcbh8$QDOIOBI?LYQ5$VaYRRNnyQ-<}+(?d=gtIe&s5@xVm z!b_oL?!GzLRGKkJe97EXT%V&AF^Toj-S_7jvWBSN{0B< C>3I79 literal 0 HcmV?d00001 diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/38/08a710b52a152bb73805fe274e0d877cf61800 b/test/integration/mergeConflictUndo/expected/.git_keep/objects/38/08a710b52a152bb73805fe274e0d877cf61800 new file mode 100644 index 000000000..74bc806ad --- /dev/null +++ b/test/integration/mergeConflictUndo/expected/.git_keep/objects/38/08a710b52a152bb73805fe274e0d877cf61800 @@ -0,0 +1,2 @@ +xA +0E]ATzI34)ɴMK0 |>o\a83BQ/h Eǜ}aAsjAwތ1O*B|V'5C/Q&c۬5x70| \ No newline at end of file diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/4f/80ec0c7b09eeeb580d0c19947477c02bc88c25 b/test/integration/mergeConflictUndo/expected/.git_keep/objects/4f/80ec0c7b09eeeb580d0c19947477c02bc88c25 new file mode 100644 index 000000000..e0670d284 --- /dev/null +++ b/test/integration/mergeConflictUndo/expected/.git_keep/objects/4f/80ec0c7b09eeeb580d0c19947477c02bc88c25 @@ -0,0 +1 @@ +x 0CvL\jVОW=M0V^p=O;s>8w_q?dFfcPQQAo~6Eh?%k$V|@8%u6?9NMw9z>L%-RBWayi z5r^B0iiV3bc4AX$#LzLD|NhfY>uhU3v*lYKeAxJ_P^TB0N@IrC6JA{3Xuj~ql!lX= z^e-6Byj6bkI5w3g3|oZcbh8$QDOIOBI?LYQ5$VaYRRNnyQ-<}+(?d=gtIe&s5@xVm z!b_oL?!GzLRGKkJe97EXT%V&AF^Toj-S_73x)|R{IBUZ7&FzcwhOCjy!uuvtMDu~m6i-j8~!%bUVWl*=!V3)Z;K3N zYXo1kniv3qLP};)YH~?_Q6)psegAVC_RYMvVd9&|Um4#wY@XGg1vM=#GbfcnMc|## zPKRCh=FXexXm0dt*`0*78%+K3=K3ui_-5Lw_EU0uw?COtC5e01*D|ZK&V6s{jB1 literal 0 HcmV?d00001 diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/58/151e1e14571021b5d38d941538a2e3c3d0e7a9 b/test/integration/mergeConflictUndo/expected/.git_keep/objects/58/151e1e14571021b5d38d941538a2e3c3d0e7a9 new file mode 100644 index 0000000000000000000000000000000000000000..a1747ab35dbec455598a681933d737c65939e6d3 GIT binary patch literal 165 zcmV;W09yZe0gaA9YQr!P0DIOe_8us^(n|6|DS@2wjP-g&3UzF3g(SaEpdaXUn1Qin zo_{(-svmuG2db=t2{T*Midcp?RmLonG?meFWr-Xuth)KN1G(g+Sfue-aWzF)!%<(fhk?#5J{ literal 0 HcmV?d00001 diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/5d/874a902548f753e50944827e572a7470aa9731 b/test/integration/mergeConflictUndo/expected/.git_keep/objects/5d/874a902548f753e50944827e572a7470aa9731 new file mode 100644 index 0000000000000000000000000000000000000000..9633a40775d6137b880c8529d1f629282e258ea7 GIT binary patch literal 107 zcmV-x0F?iD0p*a<34kyVL;da)nV>(4Gq}dp9<87~X|IUedoJJteuO~6%SXa40pmOk z3s=V0KxiuUhGtS^Y6#2)Dtol3O3%rhL5Z7_vNHN9#VFklej8i4j3TV0&U^nWeH~Kd NeFssJdjPfiP{E>uGQ4g3%pYvzD&lvWcY&Pr_@JZHVP-@|e008rm4L|?@ literal 0 HcmV?d00001 diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/5e/9fe3aa0c84eab154f6f8796804b9e2e0ab0401 b/test/integration/mergeConflictUndo/expected/.git_keep/objects/5e/9fe3aa0c84eab154f6f8796804b9e2e0ab0401 new file mode 100644 index 000000000..706da50c3 --- /dev/null +++ b/test/integration/mergeConflictUndo/expected/.git_keep/objects/5e/9fe3aa0c84eab154f6f8796804b9e2e0ab0401 @@ -0,0 +1,2 @@ +xA +0E]$ӴM"BW=t2CcJL[n :VE{QD〬-YD@JJ 'QWlIb'N)R m-|).ǝwpFjhk[AyAa/BC \ No newline at end of file diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/5f/3e4598b46a912f0f95a4898743e979343c82f3 b/test/integration/mergeConflictUndo/expected/.git_keep/objects/5f/3e4598b46a912f0f95a4898743e979343c82f3 new file mode 100644 index 0000000000000000000000000000000000000000..27ac61738744e4923b0d928f7521dd5707074712 GIT binary patch literal 86 zcmV-c0IC0Y0V^p=O;s?nWH2!R0)>>!qSWM){Gv*R&)<{QyJ)WK{KdP@mMc1dXQ7zE s5kmt5GZPbqw9K4TLxww-Jp!s1-s(@O+<7zQ)?%hjzvs>Y05^djO6CqI%>V!Z literal 0 HcmV?d00001 diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/60/91d709b275e712111d016d9b3a4fb44e63f1f6 b/test/integration/mergeConflictUndo/expected/.git_keep/objects/60/91d709b275e712111d016d9b3a4fb44e63f1f6 new file mode 100644 index 0000000000000000000000000000000000000000..bfb5376c67ba79deb64b9463958ebd99b0ed9f64 GIT binary patch literal 54 zcmV-60LlM&0V^p=O;s>6WiT`_Ff%bxNXyJgWmvlB@n6-{8($(qqj>V2E(CbBbYDf1 MH^Qm_0Pdw7o*~;6`~Uy| literal 0 HcmV?d00001 diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/61/01e935461d4cd862ae4a720846e87880d198b9 b/test/integration/mergeConflictUndo/expected/.git_keep/objects/61/01e935461d4cd862ae4a720846e87880d198b9 new file mode 100644 index 0000000000000000000000000000000000000000..236b6cdf4f4a62168a2e0b0b9b49cdcdbc22c808 GIT binary patch literal 66 zcmV-I0KNZs0ZYosPf{>7VkpVTELH%bw9K4Tg}l<-q|_n>Lxqxz#1aKh^<0JY{LH*` Yg_3-Q\\Vo ጨ:1O]e3*hO:bϪ? \ No newline at end of file diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/72/df4fceb0be99deb091ece3f501ef80b39a876a b/test/integration/mergeConflictUndo/expected/.git_keep/objects/72/df4fceb0be99deb091ece3f501ef80b39a876a new file mode 100644 index 0000000000000000000000000000000000000000..19670ff5ad0dd0dd6e4a8ec0e9f87b3722326911 GIT binary patch literal 74 zcmV-Q0JZ;k0V^p=O;s>6WiT`_Ff%bxNXyJgWsu4F=sF|FfcPQQAo~6Eh?%k$V|@8%u6?9NMw9z>L%-RBWayi z5r^B0iiV3bc4AX$#LzLD|NhfY>uhU3v*lYKeAxJ_P^TB0N@IrC6JA{3Xuj~ql!lX= z^e-6Byj6bkI5w3g3|oZcbh8$QDOIOBI?LYQ5$VaYRRNnyQ-<}+(?d=gtIe&s5@xVm z!b_oL?!GzLRGKkJe97EXT%V&AF^Toj-S_73x)|R{IBUZ7&FzcwhOCjy!uuvtMDu~m6i-j8~!%bUVWl*=!V3)Z;K3N zYXo1kniv3qLP};)YH~?_Q6)pd#Os`!N}me}$};B8w({TNm;CV?)U>qBoK!=Gj>B{A aXr7$<Gp0gaA93c@fD06pgwdlzIkO*RRL2tD-~X|l0`F{MQG`4;?u*I@=GwOa2T zG@3)-M8NrhnX{Of=2`0)q$G`&f@5~Y(!fMMS) zvv!#nW6CPN`qDNSCpeGORX(w<4>_e)FF;IgpkO`0kqA-kbf4<-r>^9FTlxaO4BoA& IFV1;Agg7)wX#fBK literal 0 HcmV?d00001 diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/7f/983b882d71782f6520493b14e45b1eb3888a57 b/test/integration/mergeConflictUndo/expected/.git_keep/objects/7f/983b882d71782f6520493b14e45b1eb3888a57 new file mode 100644 index 000000000..e8b43881c --- /dev/null +++ b/test/integration/mergeConflictUndo/expected/.git_keep/objects/7f/983b882d71782f6520493b14e45b1eb3888a57 @@ -0,0 +1,3 @@ +xA +  ůkBV9>I&!Xf`duiià8tV> Q4amNQԞDRH +r] m=>O|R_VDƨS ,Wu/ҁ? \ No newline at end of file diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/7f/df0429a1e95f38736a260c5ed4121aa5d6e76f b/test/integration/mergeConflictUndo/expected/.git_keep/objects/7f/df0429a1e95f38736a260c5ed4121aa5d6e76f new file mode 100644 index 000000000..1ff6e120f --- /dev/null +++ b/test/integration/mergeConflictUndo/expected/.git_keep/objects/7f/df0429a1e95f38736a260c5ed4121aa5d6e76f @@ -0,0 +1,2 @@ +xM +0@a9E̴cLR"x|{o-2^j e=+iTCHAJfCz媣dr* R@ Omf{~+"99On겪p9 \ No newline at end of file diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/81/46e9924caf0aa2d21db44095ae5a0b0f6e1ce4 b/test/integration/mergeConflictUndo/expected/.git_keep/objects/81/46e9924caf0aa2d21db44095ae5a0b0f6e1ce4 new file mode 100644 index 000000000..7457a235e --- /dev/null +++ b/test/integration/mergeConflictUndo/expected/.git_keep/objects/81/46e9924caf0aa2d21db44095ae5a0b0f6e1ce4 @@ -0,0 +1,3 @@ +xK +@D])z/Hz~!'acB!w գuYlOuW }ŋ3 +![Fv)dW}v&$9]B>$YԲ0pƻlOLrHgĮ3m~+(R|< \ No newline at end of file diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/88/9b0fdfe5f2ae3d7df3066f3bc1e181fa712c8d b/test/integration/mergeConflictUndo/expected/.git_keep/objects/88/9b0fdfe5f2ae3d7df3066f3bc1e181fa712c8d new file mode 100644 index 0000000000000000000000000000000000000000..d63de558bc9f6f0096d5c3091fc31b9d8b2630eb GIT binary patch literal 66 zcmV-I0KNZs0ZYosPf{>7VkpVTELH%bw9K4Tg}l<-q|_n>BZZQT#1aKh^<0JY{LH*` Yg_3-Q4S%^SLg|yFpm%oy_5Q@LNrc#=mehd019~do(7VkpVTELH%bw9K4Tg}l<-q|_n>3x$%5#1aKh^<0JY{LH*` Yg_3-Q8G-fa~FfcPQQAo~6Eh?%k$V|@8%u6?9NMw9z>L%-RBWayi z5r^B0iiV3bc4AX$#LzLD|NhfY>uhU3v*lYKeAxJ_P^TB0N@IrC6JA{3Xuj~ql!lX= z^e-6Byj6bkI5w3g3|oZcbh8$QDOIOBI?LYQ5$VaYRRNnyQ-<}+(?d=gtIe&s5@xVm z!b_oL?!GzLRGKkJe97EXT%V&AF^Toj-S_73x)|R{IBUZ7&FzcwhOCjy!uuvtMDu~m6i-j8~!%bUVWl*=!V3)Z;K3N zYXo1kniv3qLP};)YH~?_Q6Zgztm|#@^04{ye Es|G`_Y5)KL literal 0 HcmV?d00001 diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/9d/e8260b738a34a74533df54f2e404276aa96242 b/test/integration/mergeConflictUndo/expected/.git_keep/objects/9d/e8260b738a34a74533df54f2e404276aa96242 new file mode 100644 index 0000000000000000000000000000000000000000..ffc277c86c56c088175e46f1590082f30deb89cd GIT binary patch literal 54 zcmV-60LlM&0V^p=O;s>6WiT`_Ff%bxNXyJgWsuayG$ z7{o){MPO#aA}NT@ULq4&6Ll7{oFjAeg*lPdL2YT5wShQIk?fq3=ppvTI$w;Klm~-> zLZ+Dq7m7-+cB?y#6P(BCDxb7$4>^^(TmXGHac~jgh^V#dv`;npQ&&$Zb!GTvP*-4i M%cE}U3wR?zafFCRC;$Ke literal 0 HcmV?d00001 diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/mergeConflictUndo/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 new file mode 100644 index 0000000000000000000000000000000000000000..285df3e5fbab12262e28d85e78af8a31cd0024c1 GIT binary patch literal 21 ccmb`~^A08nuUMF0Q* literal 0 HcmV?d00001 diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/ab/172f11e9d1ffc28e53b7c5504f173bf1b27527 b/test/integration/mergeConflictUndo/expected/.git_keep/objects/ab/172f11e9d1ffc28e53b7c5504f173bf1b27527 new file mode 100644 index 0000000000000000000000000000000000000000..d98609f9ca09dffbf2298efb8cee3a4ea69d859c GIT binary patch literal 147 zcmV;E0Brww0gaAJ3c@fDKwak)*$a}H$)^Dk!Bvkj$xKi%w$un7-yXs3HRS* zWOo>ws>PJO2VhPmQSrV7qE@DeRZ5o91gHkdXjb0zHEe3qoX5{P}Ie!c_#fXjP02d=eR zZyh4xuCMNZM^i7BnbDHDBz8SOy Nsyw$kd;s%MK+dnhOW*(i literal 0 HcmV?d00001 diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/af/a76754c933269d7cd45630a7184a20849dbe9c b/test/integration/mergeConflictUndo/expected/.git_keep/objects/af/a76754c933269d7cd45630a7184a20849dbe9c new file mode 100644 index 0000000000000000000000000000000000000000..7302ca34e9d34bcda37b5a408f6b509933d555f2 GIT binary patch literal 66 zcmV-I0KNZs0ZYosPf{>7VkpVTELH%bw9K4Tg}l<-q|_n>Q-zX@#1aKh^<0JY{LH*` Yg_3-Q7VkpVTELH%bw9K4Tg}l<-q|_n>6NQqD#1aKh^<0JY{LH*` Yg_3-Qb%7 literal 0 HcmV?d00001 diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/c1/dd146476a4a37fff75b88612a718281ea83b58 b/test/integration/mergeConflictUndo/expected/.git_keep/objects/c1/dd146476a4a37fff75b88612a718281ea83b58 new file mode 100644 index 0000000000000000000000000000000000000000..008bb1a6567766c154b88180e8aa85b15392362c GIT binary patch literal 277 zcmV+w0qXvE0V^p=O;s>9GiER}FfcPQQAo~6Eh?%k$V|@8%u6?9NMw9z>L%-RBWayi z5r^B0iiV3bc4AX$#LzLD|NhfY>uhU3v*lYKeAxJ_P^TB0N@IrC6JA{3Xuj~ql!lX= z^e-6Byj6bkI5w3g3|oZcbh8$QDOIOBI?LYQ5$VaYRRNnyQ-<}+(?d=gtIe&s5@xVm z!b_oL?!GzLRGKkJe97EXT%V&AF^Toj-S_7i&B$I@{1}N5++{f+*JBpNKlqBcea)P7Qf_=-=Lmn|?7bhJ@}*^e%Z<0?VIcu_P+|sq1#r%s^_*(*CpS93#qvb!ORD(+ HY>_;_hx|x~ literal 0 HcmV?d00001 diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/ca/d08b7e2fbbabb2235cc4ca7785f8ba00247d50 b/test/integration/mergeConflictUndo/expected/.git_keep/objects/ca/d08b7e2fbbabb2235cc4ca7785f8ba00247d50 new file mode 100644 index 0000000000000000000000000000000000000000..a28c77ab875fdf4023f6a0d023dd0b6b04322e59 GIT binary patch literal 158 zcmV;P0Ac@l0gaA93c@fDMP26E?Hy~-|bO17)H1b<6S?otWUj6wcG%E^bUms!Wq$8bI{{d(?4~Smu+wGtDwH1 M#QliP7dVPP#F_j`G5`Po literal 0 HcmV?d00001 diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/d0/60f7226715ca55b04e91fad2b8aca01badd993 b/test/integration/mergeConflictUndo/expected/.git_keep/objects/d0/60f7226715ca55b04e91fad2b8aca01badd993 new file mode 100644 index 0000000000000000000000000000000000000000..ab357ec23a607497ddef075b5880fd9579922e8d GIT binary patch literal 303 zcmV+~0nq+<0V^p=O;s>4Fl8__FfcPQQAo~6Eh?%k$V|@8%u6?9NMw9z>L%-RBWayi z5r^B0iiV3bc4AX$#LzLD|NhfY>uhU3v*lYKeAxJ_P^TB0N@IrC6JA{3Xuj~ql!lX= z^e-6Byj6bkI5w3g3|oZcbh8$QDOIOBI?LYQ5$VaYRRNnyQ-<}+(?d=gtIe&s5@xVm z!b_oL?!GzLRGKkJe97EXT%V&AF^Toj-S_73x)|R{IBUZ7&FzcwhOCjy!uuvtMIIe0T3vpWEQ0+m*f{!G9*mA&bg`d zxsaeNWA1D#|1EyWAHP9OOUukjHDu^GJm-$)$*DgcF0(o7@qG8Sn>jmn003Pvs7;ya BlW+h4 literal 0 HcmV?d00001 diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/d8/a7c50dcab42b2b62e5c77cdcece620d3964bd4 b/test/integration/mergeConflictUndo/expected/.git_keep/objects/d8/a7c50dcab42b2b62e5c77cdcece620d3964bd4 new file mode 100644 index 0000000000000000000000000000000000000000..198bff1ec786820e0c2f41db6e2bed90f1e103fa GIT binary patch literal 201 zcmV;)05<=40V^p=O;s>5HfJz2FfcPQQAo~6Eh?%k$V|@8%u6?9NMw9z>L%-RBWayi z5r^B0iiV3bc4AX$#LzLD|NhfY>uhU3v*lYKeAxJ_P^TB0N@IrC6JA{3Xuj~ql!lX= z^e-6Byj6bkI5w3g3|oZcbh8$QDOIOBI?LYQ5$VaYRl&pn2ozE>i&B$I@{1}N5++{f z+*JBpNKlqBcea)P7Qf_=-=L5w`4FhFfcPQQAo~6Eh?%k$V|@8%u6?9NMw9z>L%-RBWayi z5r^B0iiV3bc4AX$#LzLD|NhfY>uhU3v*lYKeAxJ_P^TB0N@IrC6JA{3Xuj~ql!lX= z^e-6Byj6bkI5w3g3|oZcbh8$QDOIOBI?LYQ5$VaYRRNnyQ-<}+(?d=gtIe&s5@xVm z!b_oL?!GxD20);Yl3A3RT#{c@$&fJdI_IX+=R$(AjJdO|{I~cefBXhDEiE%A)sUg% d@SHoEC#U{+xXk9P$MfCSZszRR0RVyibtbb-a`^xN literal 0 HcmV?d00001 diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/db/35d1bf1bfbb57b4b345ee4f6f0554e9e72b015 b/test/integration/mergeConflictUndo/expected/.git_keep/objects/db/35d1bf1bfbb57b4b345ee4f6f0554e9e72b015 new file mode 100644 index 0000000000000000000000000000000000000000..a634f2a57d2c73fc27aec43e6aaacd5607a0e00a GIT binary patch literal 121 zcmV-<0EYi~0ga783c@fD06pgwdl#hJCffu=gr540ZMusELnLm&=UeatUWXYb*HShE z40y680^*5i;Xe6Dw1$kNiB*=&S)+PhRb=!-a=hE4Hkf9(PV-$pTwYJPW literal 0 HcmV?d00001 diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/dc/d348507ba1da8f6479b9d964daa302b2fb9d9c b/test/integration/mergeConflictUndo/expected/.git_keep/objects/dc/d348507ba1da8f6479b9d964daa302b2fb9d9c new file mode 100644 index 000000000..74c919681 --- /dev/null +++ b/test/integration/mergeConflictUndo/expected/.git_keep/objects/dc/d348507ba1da8f6479b9d964daa302b2fb9d9c @@ -0,0 +1 @@ +x 0C?3ƵV=iO=,8tW@h*&R$j*yʑs-ܜ8v)u㧱VH" P \ No newline at end of file diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/mergeConflictUndo/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b new file mode 100644 index 0000000000000000000000000000000000000000..9b771fc2f6f41f91b00976b4ff3f8f9935f7931e GIT binary patch literal 21 ccmb>`CU&08otwO#lD@ literal 0 HcmV?d00001 diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/e3/ae5c6d8407e8307b9bc77923be78c901408f6e b/test/integration/mergeConflictUndo/expected/.git_keep/objects/e3/ae5c6d8407e8307b9bc77923be78c901408f6e new file mode 100644 index 0000000000000000000000000000000000000000..3a7ee91eab601eb205b04a6e1e62c58599193222 GIT binary patch literal 50 zcmb7nZts^PE0#+C9!Ty%L6BZHMO GUmgJUj1jT` literal 0 HcmV?d00001 diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/e4/48ae5bf6371d80ebee24a22b6df341797a6511 b/test/integration/mergeConflictUndo/expected/.git_keep/objects/e4/48ae5bf6371d80ebee24a22b6df341797a6511 new file mode 100644 index 0000000000000000000000000000000000000000..714e20cb7eb8a76c9832939c1e2a103d78bb257d GIT binary patch literal 66 zcmV-I0KNZs0ZYosPf{>7VkpVTELH%bw9K4Tg}l<-q|_n>bA^(O#1aKh^<0JY{LH*` Yg_3-Q>!qSWM){Gv*Rgo)QVHރ47o 1$#rq&&>L8 c91 p 8R8y)3 6N.WA}@,uS_6? \ No newline at end of file diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/ea/a48cb1e3d47e1b8b8df47bdc248e991207cc3d b/test/integration/mergeConflictUndo/expected/.git_keep/objects/ea/a48cb1e3d47e1b8b8df47bdc248e991207cc3d new file mode 100644 index 0000000000000000000000000000000000000000..b047d6827a093b8790d0dd53e0382e18ed1ea88a GIT binary patch literal 361 zcmV-v0ha!F0V^p=O;s>8F=H?^FfcPQQAo~6Eh?%k$V|@8%u6?9NMw9z>L%-RBWayi z5r^B0iiV3bc4AX$#LzLD|NhfY>uhU3v*lYKeAxJ_P^TB0N@IrC6JA{3Xuj~ql!lX= z^e-6Byj6bkI5w3g3|oZcbh8$QDOIOBI?LYQ5$VaYRRNnyQ-<}+(?d=gtIe&s5@xVm z!b_oL?!GzLRGKkJe97EXT%V&AF^Toj-S_73x)|R{IBUZ7&FzcwhOCjy!uuvtMDu~m6i-j8~!%bUVWl*=!V3)Z;K3N zYXo1kniv3qLP};)YH~?_Q6Zgztm=IE6id6vs H4=>-(3qr6K literal 0 HcmV?d00001 diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/eb/90e8d7b137a1d89480c9b22fd03199da77c9c7 b/test/integration/mergeConflictUndo/expected/.git_keep/objects/eb/90e8d7b137a1d89480c9b22fd03199da77c9c7 new file mode 100644 index 0000000000000000000000000000000000000000..4992422c7407bf6efc09d23127726c19cec1119d GIT binary patch literal 66 zcmV-I0KNZs0ZYosPf{>7VkpVTELH%bw9K4Tg}l<-q|_n>V}+88#1aKh^<0JY{LH*` Yg_3-Q5Fkmn-00M=S%%arflKi4dhR@%V*1Kq~>-@#L&Xy}WfM=nY z!4X3P12Yp7g|y6^R0eS?hqn=r4HCq1PXDguIm6t(FP;-g-jLzWWsiXBg}3@sDtF#Y yxwV*S)9<-+kQ5j*JYE-*+rs|BpnCT4O67eOCm9|3^N@@RRI7%&rx)LLPgyG literal 0 HcmV?d00001 diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/f3/f762af4429ae89fa0dae3d0a5b500ca11630c4 b/test/integration/mergeConflictUndo/expected/.git_keep/objects/f3/f762af4429ae89fa0dae3d0a5b500ca11630c4 new file mode 100644 index 0000000000000000000000000000000000000000..e9f9f0881a1460f9b019818b1cbd6e4f67fe70aa GIT binary patch literal 54 zcmV-60LlM&0V^p=O;s>6WiT`_Ff%bxNXyJgWw@Wst9_>I*&F^-3WwAMy!L%-RBWayi z5r^B0iiV3bc4AX$#LzLD|NhfY>uhU3v*lYKeAxJ_P^TB0N@IrC6JA{3Xuj~ql!lX= z^e-6Byj6bkI5w3g3|oZcbh8$QDOIOBI?LYQ5$VaYRRNnyQ-<}+(?d=gtIe&s5@xVm z!b_oL?!GzLRGKkJe97EXT%V&AF^Toj-S_73x)|R{IBUZ7&FzcwhOCjy!uuvtMDu~m6i-j8~!%bUVWl*=!V3)Z;K3N zYXo1kniv3qLP};)YH~?_Q6ZbrQLc@`W;jN4S literal 0 HcmV?d00001 diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/refs/heads/base_branch b/test/integration/mergeConflictUndo/expected/.git_keep/refs/heads/base_branch new file mode 100644 index 000000000..a0b7c7bb1 --- /dev/null +++ b/test/integration/mergeConflictUndo/expected/.git_keep/refs/heads/base_branch @@ -0,0 +1 @@ +c4b40606be30048d61ed9bb55e21ecd612f34d7d diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/refs/heads/develop b/test/integration/mergeConflictUndo/expected/.git_keep/refs/heads/develop new file mode 100644 index 000000000..400785e4e --- /dev/null +++ b/test/integration/mergeConflictUndo/expected/.git_keep/refs/heads/develop @@ -0,0 +1 @@ +8b7aa507318e42a4efdae2c867d89590bbce48e5 diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/refs/heads/feature/cherry-picking b/test/integration/mergeConflictUndo/expected/.git_keep/refs/heads/feature/cherry-picking new file mode 100644 index 000000000..dd50c1b77 --- /dev/null +++ b/test/integration/mergeConflictUndo/expected/.git_keep/refs/heads/feature/cherry-picking @@ -0,0 +1 @@ +7d80e0ed109e6802aa1f23a473200c9af3f8cf61 diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/refs/heads/master b/test/integration/mergeConflictUndo/expected/.git_keep/refs/heads/master new file mode 100644 index 000000000..600f6b0ef --- /dev/null +++ b/test/integration/mergeConflictUndo/expected/.git_keep/refs/heads/master @@ -0,0 +1 @@ +5e9fe3aa0c84eab154f6f8796804b9e2e0ab0401 diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/refs/heads/other_branch b/test/integration/mergeConflictUndo/expected/.git_keep/refs/heads/other_branch new file mode 100644 index 000000000..ce5ef7aa4 --- /dev/null +++ b/test/integration/mergeConflictUndo/expected/.git_keep/refs/heads/other_branch @@ -0,0 +1 @@ +0a71a0176c3eb0a7ccba7e8e675743aecb362f3a diff --git a/test/integration/mergeConflictUndo/expected/cherrypicking1 b/test/integration/mergeConflictUndo/expected/cherrypicking1 new file mode 100644 index 000000000..6101e9354 --- /dev/null +++ b/test/integration/mergeConflictUndo/expected/cherrypicking1 @@ -0,0 +1 @@ +this is file number 1 that I'm going to cherry-pick diff --git a/test/integration/mergeConflictUndo/expected/cherrypicking2 b/test/integration/mergeConflictUndo/expected/cherrypicking2 new file mode 100644 index 000000000..889b0fdfe --- /dev/null +++ b/test/integration/mergeConflictUndo/expected/cherrypicking2 @@ -0,0 +1 @@ +this is file number 2 that I'm going to cherry-pick diff --git a/test/integration/mergeConflictUndo/expected/cherrypicking3 b/test/integration/mergeConflictUndo/expected/cherrypicking3 new file mode 100644 index 000000000..eb90e8d7b --- /dev/null +++ b/test/integration/mergeConflictUndo/expected/cherrypicking3 @@ -0,0 +1 @@ +this is file number 3 that I'm going to cherry-pick diff --git a/test/integration/mergeConflictUndo/expected/cherrypicking4 b/test/integration/mergeConflictUndo/expected/cherrypicking4 new file mode 100644 index 000000000..b4121e2d6 --- /dev/null +++ b/test/integration/mergeConflictUndo/expected/cherrypicking4 @@ -0,0 +1 @@ +this is file number 4 that I'm going to cherry-pick diff --git a/test/integration/mergeConflictUndo/expected/cherrypicking5 b/test/integration/mergeConflictUndo/expected/cherrypicking5 new file mode 100644 index 000000000..afa76754c --- /dev/null +++ b/test/integration/mergeConflictUndo/expected/cherrypicking5 @@ -0,0 +1 @@ +this is file number 5 that I'm going to cherry-pick diff --git a/test/integration/mergeConflictUndo/expected/cherrypicking6 b/test/integration/mergeConflictUndo/expected/cherrypicking6 new file mode 100644 index 000000000..18f469bc7 --- /dev/null +++ b/test/integration/mergeConflictUndo/expected/cherrypicking6 @@ -0,0 +1 @@ +this is file number 6 that I'm going to cherry-pick diff --git a/test/integration/mergeConflictUndo/expected/cherrypicking7 b/test/integration/mergeConflictUndo/expected/cherrypicking7 new file mode 100644 index 000000000..e448ae5bf --- /dev/null +++ b/test/integration/mergeConflictUndo/expected/cherrypicking7 @@ -0,0 +1 @@ +this is file number 7 that I'm going to cherry-pick diff --git a/test/integration/mergeConflictUndo/expected/cherrypicking8 b/test/integration/mergeConflictUndo/expected/cherrypicking8 new file mode 100644 index 000000000..90a84fd62 --- /dev/null +++ b/test/integration/mergeConflictUndo/expected/cherrypicking8 @@ -0,0 +1 @@ +this is file number 8 that I'm going to cherry-pick diff --git a/test/integration/mergeConflictUndo/expected/cherrypicking9 b/test/integration/mergeConflictUndo/expected/cherrypicking9 new file mode 100644 index 000000000..22b0fd807 --- /dev/null +++ b/test/integration/mergeConflictUndo/expected/cherrypicking9 @@ -0,0 +1 @@ +this is file number 9 that I'm going to cherry-pick diff --git a/test/integration/mergeConflictUndo/expected/directory/file b/test/integration/mergeConflictUndo/expected/directory/file new file mode 100644 index 000000000..180cf8328 --- /dev/null +++ b/test/integration/mergeConflictUndo/expected/directory/file @@ -0,0 +1 @@ +test2 diff --git a/test/integration/mergeConflictUndo/expected/directory/file2 b/test/integration/mergeConflictUndo/expected/directory/file2 new file mode 100644 index 000000000..df6b0d2bc --- /dev/null +++ b/test/integration/mergeConflictUndo/expected/directory/file2 @@ -0,0 +1 @@ +test3 diff --git a/test/integration/mergeConflictUndo/expected/file b/test/integration/mergeConflictUndo/expected/file new file mode 100644 index 000000000..2410ee12b --- /dev/null +++ b/test/integration/mergeConflictUndo/expected/file @@ -0,0 +1 @@ +new2\noriginal2\noriginal3 diff --git a/test/integration/mergeConflictUndo/expected/file1 b/test/integration/mergeConflictUndo/expected/file1 new file mode 100644 index 000000000..5d874a902 --- /dev/null +++ b/test/integration/mergeConflictUndo/expected/file1 @@ -0,0 +1,63 @@ +Here is a story that has been told throuhg the ages +once upon a time there was a cat +... +... +... +... +... +... +... +... +... +... +... +... +... +... +... +... +... +... +... +... +... +... +... +... +... +... +... +... +... +... +... +... +... +... +... +... +... +... +... +... +... +... +... +... +... +... +... +... +... +... +... +... +... +... +... +... +... +... +... +... +once upon a time there was another dog diff --git a/test/integration/mergeConflictUndo/expected/file3 b/test/integration/mergeConflictUndo/expected/file3 new file mode 100644 index 000000000..e3ae5c6d8 --- /dev/null +++ b/test/integration/mergeConflictUndo/expected/file3 @@ -0,0 +1 @@ +once upon a time there was a horse diff --git a/test/integration/mergeConflictUndo/expected/file4 b/test/integration/mergeConflictUndo/expected/file4 new file mode 100644 index 000000000..e3ae5c6d8 --- /dev/null +++ b/test/integration/mergeConflictUndo/expected/file4 @@ -0,0 +1 @@ +once upon a time there was a horse diff --git a/test/integration/mergeConflictUndo/expected/file5 b/test/integration/mergeConflictUndo/expected/file5 new file mode 100644 index 000000000..e3ae5c6d8 --- /dev/null +++ b/test/integration/mergeConflictUndo/expected/file5 @@ -0,0 +1 @@ +once upon a time there was a horse diff --git a/test/integration/mergeConflictUndo/recording.json b/test/integration/mergeConflictUndo/recording.json new file mode 100644 index 000000000..59ef81733 --- /dev/null +++ b/test/integration/mergeConflictUndo/recording.json @@ -0,0 +1 @@ +[{"Timestamp":28,"Event":{"Type":1,"Mod":0,"Key":0,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":0,"Bytes":null}},{"Timestamp":468,"Event":{"Type":0,"Mod":0,"Key":32,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"IA=="}},{"Timestamp":675,"Event":{"Type":0,"Mod":0,"Key":0,"Ch":99,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"Yw=="}},{"Timestamp":764,"Event":{"Type":0,"Mod":0,"Key":0,"Ch":97,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"YQ=="}},{"Timestamp":820,"Event":{"Type":0,"Mod":0,"Key":0,"Ch":115,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"cw=="}},{"Timestamp":877,"Event":{"Type":0,"Mod":0,"Key":0,"Ch":100,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"ZA=="}},{"Timestamp":1084,"Event":{"Type":0,"Mod":0,"Key":13,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"DQ=="}},{"Timestamp":1470,"Event":{"Type":0,"Mod":0,"Key":65514,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09D"}},{"Timestamp":1613,"Event":{"Type":0,"Mod":0,"Key":65514,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09D"}},{"Timestamp":1805,"Event":{"Type":0,"Mod":0,"Key":65516,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09C"}},{"Timestamp":2101,"Event":{"Type":0,"Mod":0,"Key":65515,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09E"}},{"Timestamp":2268,"Event":{"Type":0,"Mod":0,"Key":65516,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09C"}},{"Timestamp":2389,"Event":{"Type":0,"Mod":0,"Key":65516,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09C"}},{"Timestamp":2548,"Event":{"Type":0,"Mod":0,"Key":65516,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09C"}},{"Timestamp":3316,"Event":{"Type":0,"Mod":0,"Key":0,"Ch":77,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"TQ=="}},{"Timestamp":3700,"Event":{"Type":0,"Mod":0,"Key":13,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"DQ=="}},{"Timestamp":4444,"Event":{"Type":0,"Mod":0,"Key":13,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"DQ=="}},{"Timestamp":5284,"Event":{"Type":0,"Mod":0,"Key":13,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"DQ=="}},{"Timestamp":5613,"Event":{"Type":0,"Mod":0,"Key":65516,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09C"}},{"Timestamp":5900,"Event":{"Type":0,"Mod":0,"Key":32,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"IA=="}},{"Timestamp":6684,"Event":{"Type":0,"Mod":0,"Key":13,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"DQ=="}},{"Timestamp":6924,"Event":{"Type":0,"Mod":0,"Key":65517,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09B"}},{"Timestamp":7148,"Event":{"Type":0,"Mod":0,"Key":32,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"IA=="}},{"Timestamp":8195,"Event":{"Type":0,"Mod":0,"Key":13,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"DQ=="}},{"Timestamp":8604,"Event":{"Type":0,"Mod":0,"Key":65516,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09C"}},{"Timestamp":9197,"Event":{"Type":0,"Mod":0,"Key":32,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"IA=="}},{"Timestamp":9669,"Event":{"Type":0,"Mod":0,"Key":0,"Ch":122,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"eg=="}},{"Timestamp":10190,"Event":{"Type":0,"Mod":0,"Key":65514,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09D"}},{"Timestamp":10788,"Event":{"Type":0,"Mod":0,"Key":65517,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09B"}},{"Timestamp":11244,"Event":{"Type":0,"Mod":0,"Key":32,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"IA=="}},{"Timestamp":12036,"Event":{"Type":0,"Mod":0,"Key":0,"Ch":122,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"eg=="}},{"Timestamp":12557,"Event":{"Type":0,"Mod":0,"Key":65516,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09C"}},{"Timestamp":13109,"Event":{"Type":0,"Mod":0,"Key":65514,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09D"}},{"Timestamp":13612,"Event":{"Type":0,"Mod":0,"Key":65516,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09C"}},{"Timestamp":13853,"Event":{"Type":0,"Mod":0,"Key":32,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"IA=="}},{"Timestamp":14893,"Event":{"Type":0,"Mod":0,"Key":65517,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09B"}},{"Timestamp":15324,"Event":{"Type":0,"Mod":0,"Key":32,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"IA=="}},{"Timestamp":17380,"Event":{"Type":0,"Mod":0,"Key":32,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"IA=="}},{"Timestamp":18036,"Event":{"Type":0,"Mod":0,"Key":32,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"IA=="}},{"Timestamp":18364,"Event":{"Type":0,"Mod":0,"Key":32,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"IA=="}},{"Timestamp":18621,"Event":{"Type":0,"Mod":0,"Key":32,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"IA=="}},{"Timestamp":18908,"Event":{"Type":0,"Mod":0,"Key":32,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"IA=="}},{"Timestamp":19189,"Event":{"Type":0,"Mod":0,"Key":32,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"IA=="}},{"Timestamp":20308,"Event":{"Type":0,"Mod":0,"Key":13,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"DQ=="}},{"Timestamp":21452,"Event":{"Type":0,"Mod":0,"Key":0,"Ch":113,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"cQ=="}}] \ No newline at end of file diff --git a/test/integration/mergeConflictUndo/setup.sh b/test/integration/mergeConflictUndo/setup.sh new file mode 100644 index 000000000..0d9a57cf9 --- /dev/null +++ b/test/integration/mergeConflictUndo/setup.sh @@ -0,0 +1,156 @@ +#!/bin/sh + +cd $1 + +git init +git config user.email "CI@example.com" +git config user.name "CI" + + +function add_spacing { + for i in {1..60} + do + echo "..." >> $1 + done +} + +mkdir directory +echo "test1" > directory/file +echo "test1" > directory/file2 + + +echo "Here is a story that has been told throuhg the ages" >> file1 + +git add file1 +git add directory +git commit -m "first commit" + +git checkout -b feature/cherry-picking + +echo "this is file number 1 that I'm going to cherry-pick" > cherrypicking1 +echo "this is file number 2 that I'm going to cherry-pick" > cherrypicking2 + +git add . + +git commit -am "first commit freshman year" + +echo "this is file number 3 that I'm going to cherry-pick" > cherrypicking3 + +git add . + +git commit -am "second commit subway eat fresh" + +echo "this is file number 4 that I'm going to cherry-pick" > cherrypicking4 + +git add . + +git commit -am "third commit fresh" + +echo "this is file number 5 that I'm going to cherry-pick" > cherrypicking5 + +git add . + +git commit -am "fourth commit cool" + +echo "this is file number 6 that I'm going to cherry-pick" > cherrypicking6 + +git add . + +git commit -am "fifth commit nice" + +echo "this is file number 7 that I'm going to cherry-pick" > cherrypicking7 + +git add . + +git commit -am "sixth commit haha" + +echo "this is file number 8 that I'm going to cherry-pick" > cherrypicking8 + +git add . + +git commit -am "seventh commit yeah" + +echo "this is file number 9 that I'm going to cherry-pick" > cherrypicking9 + +git add . + +git commit -am "eighth commit woo" + + +git checkout -b develop +echo "once upon a time there was a dog" >> file1 +add_spacing file1 +echo "once upon a time there was another dog" >> file1 +git add file1 +echo "test2" > directory/file +echo "test2" > directory/file2 +git add directory +git commit -m "first commit on develop" + + +git checkout master +echo "once upon a time there was a cat" >> file1 +add_spacing file1 +echo "once upon a time there was another cat" >> file1 +git add file1 +echo "test3" > directory/file +echo "test3" > directory/file2 +git add directory +git commit -m "first commit on master" + + +git checkout develop +echo "once upon a time there was a mouse" >> file3 +git add file3 +git commit -m "second commit on develop" + + +git checkout master +echo "once upon a time there was a horse" >> file3 +git add file3 +git commit -m "second commit on master" + + +git checkout develop +echo "once upon a time there was a mouse" >> file4 +git add file4 +git commit -m "third commit on develop" + + +git checkout master +echo "once upon a time there was a horse" >> file4 +git add file4 +git commit -m "third commit on master" + + +git checkout develop +echo "once upon a time there was a mouse" >> file5 +git add file5 +git commit -m "fourth commit on develop" + + +git checkout master +echo "once upon a time there was a horse" >> file5 +git add file5 +git commit -m "fourth commit on master" + + +# this is for the autostash feature + +git checkout -b base_branch + +echo "original1\noriginal2\noriginal3" > file +git add file +git commit -m "file" + +git checkout -b other_branch + +git checkout base_branch + +echo "new1\noriginal2\noriginal3" > file +git add file +git commit -m "file changed" + +git checkout other_branch + +echo "new2\noriginal2\noriginal3" > file diff --git a/test/integration/mergeConflictUndo/test.json b/test/integration/mergeConflictUndo/test.json new file mode 100644 index 000000000..5ce11f66a --- /dev/null +++ b/test/integration/mergeConflictUndo/test.json @@ -0,0 +1 @@ +{ "description": "In this test we make use of the undo feature in the merge conflict context", "speed": 12 }