From 78859c63442bb367a4d426ec8ee31c82a28a93d7 Mon Sep 17 00:00:00 2001 From: Edward Thomson Date: Fri, 20 Nov 2015 17:33:49 -0500 Subject: [PATCH] merge: handle conflicts in recursive base building When building a recursive merge base, allow conflicts to occur. Use the file (with conflict markers) as the common ancestor. The user has already seen and dealt with this conflict by virtue of having a criss-cross merge. If they resolved this conflict identically in both branches, then there will be no conflict in the result. This is the best case scenario. If they did not resolve the conflict identically in the two branches, then we will generate a new conflict. If the user is simply using standard conflict output then the results will be fairly sensible. But if the user is using a mergetool or using diff3 output, then the common ancestor will be a conflict file (itself with diff3 output, haha!). This is quite terrible, but it matches git's behavior. --- src/merge.c | 67 ++++++++++----- tests/merge/conflict_data.h | 31 +++++++ tests/merge/trees/recursive.c | 80 ++++++++++++++++++ tests/merge/workdir/recursive.c | 35 +++++++- .../15/311229e70fa62653f73dde1d4deef1a8e47a11 | Bin 0 -> 710 bytes .../37/185b25a204309bf74817da1a607518f13ca3ed | Bin 0 -> 715 bytes .../37/a5054a9f9b4628e3924c5cb8f2147c6e2a3efc | Bin 0 -> 630 bytes .../42/44d13e2bbc38510320443bbb003f3967d12436 | Bin 0 -> 207 bytes .../4f/4e85a0ab8515e34302721fbcec06fa9d9c1a9a | Bin 0 -> 631 bytes .../56/07a8c4601a737daadd1f470bde3142aff57026 | Bin 0 -> 206 bytes .../63/e8773becdea9c3699c95a5740be5baa8be8d69 | Bin 0 -> 207 bytes .../6c/778edd0e4cf394f5a3df8b96db516024cc1bb8 | Bin 0 -> 636 bytes .../6e/f31d35a3f5abc1e24f4f9afa5cb2016f03fa2d | Bin 0 -> 174 bytes .../7a/9277e0c5ec75339f011c176d0c20e513c4de1c | Bin 0 -> 202 bytes .../88/8588a782ad433fbf0cc526e07cfe6f4a6b60b3 | Bin 0 -> 208 bytes .../98/1c79eb38518d3821e73bb159dc413bb42d6614 | Bin 0 -> 208 bytes .../a0/2d4fd126e0cc8fb46ee48cf38bad36d44f2dbc | Bin 0 -> 649 bytes .../aa/9e263294fd2f6f6fd9ceab23ca8ce3ea2ce707 | Bin 0 -> 175 bytes .../b9/1ef5ffa8612616c8e76051901caafd723f0e2c | Bin 0 -> 712 bytes .../ca/fa936d25f0b397432a27201f6b3284c47df8be | Bin 0 -> 712 bytes .../d6/04c75019c282144bdbbf3fd3462ba74b240efc | Bin 0 -> 620 bytes .../db/203155a789fb749aa3c14e93eea2c744a9c6c7 | Bin 0 -> 204 bytes .../e1/512550f09d980214e46e6d3f5a2b20c3d75755 | Bin 0 -> 208 bytes .../f7/929c5a67a4bdc98247fb4b5098675723932a64 | Bin 0 -> 207 bytes .../.gitted/refs/heads/branchH-1 | Bin 0 -> 41 bytes .../.gitted/refs/heads/branchH-2 | Bin 0 -> 41 bytes .../.gitted/refs/heads/branchI-1 | Bin 0 -> 41 bytes .../.gitted/refs/heads/branchI-2 | Bin 0 -> 41 bytes 28 files changed, 193 insertions(+), 20 deletions(-) create mode 100644 tests/resources/merge-recursive/.gitted/objects/15/311229e70fa62653f73dde1d4deef1a8e47a11 create mode 100644 tests/resources/merge-recursive/.gitted/objects/37/185b25a204309bf74817da1a607518f13ca3ed create mode 100644 tests/resources/merge-recursive/.gitted/objects/37/a5054a9f9b4628e3924c5cb8f2147c6e2a3efc create mode 100644 tests/resources/merge-recursive/.gitted/objects/42/44d13e2bbc38510320443bbb003f3967d12436 create mode 100644 tests/resources/merge-recursive/.gitted/objects/4f/4e85a0ab8515e34302721fbcec06fa9d9c1a9a create mode 100644 tests/resources/merge-recursive/.gitted/objects/56/07a8c4601a737daadd1f470bde3142aff57026 create mode 100644 tests/resources/merge-recursive/.gitted/objects/63/e8773becdea9c3699c95a5740be5baa8be8d69 create mode 100644 tests/resources/merge-recursive/.gitted/objects/6c/778edd0e4cf394f5a3df8b96db516024cc1bb8 create mode 100644 tests/resources/merge-recursive/.gitted/objects/6e/f31d35a3f5abc1e24f4f9afa5cb2016f03fa2d create mode 100644 tests/resources/merge-recursive/.gitted/objects/7a/9277e0c5ec75339f011c176d0c20e513c4de1c create mode 100644 tests/resources/merge-recursive/.gitted/objects/88/8588a782ad433fbf0cc526e07cfe6f4a6b60b3 create mode 100644 tests/resources/merge-recursive/.gitted/objects/98/1c79eb38518d3821e73bb159dc413bb42d6614 create mode 100644 tests/resources/merge-recursive/.gitted/objects/a0/2d4fd126e0cc8fb46ee48cf38bad36d44f2dbc create mode 100644 tests/resources/merge-recursive/.gitted/objects/aa/9e263294fd2f6f6fd9ceab23ca8ce3ea2ce707 create mode 100644 tests/resources/merge-recursive/.gitted/objects/b9/1ef5ffa8612616c8e76051901caafd723f0e2c create mode 100644 tests/resources/merge-recursive/.gitted/objects/ca/fa936d25f0b397432a27201f6b3284c47df8be create mode 100644 tests/resources/merge-recursive/.gitted/objects/d6/04c75019c282144bdbbf3fd3462ba74b240efc create mode 100644 tests/resources/merge-recursive/.gitted/objects/db/203155a789fb749aa3c14e93eea2c744a9c6c7 create mode 100644 tests/resources/merge-recursive/.gitted/objects/e1/512550f09d980214e46e6d3f5a2b20c3d75755 create mode 100644 tests/resources/merge-recursive/.gitted/objects/f7/929c5a67a4bdc98247fb4b5098675723932a64 create mode 100644 tests/resources/merge-recursive/.gitted/refs/heads/branchH-1 create mode 100644 tests/resources/merge-recursive/.gitted/refs/heads/branchH-2 create mode 100644 tests/resources/merge-recursive/.gitted/refs/heads/branchI-1 create mode 100644 tests/resources/merge-recursive/.gitted/refs/heads/branchI-2 diff --git a/src/merge.c b/src/merge.c index 64c8f1116..f05e45c9f 100644 --- a/src/merge.c +++ b/src/merge.c @@ -49,6 +49,19 @@ #define GIT_MERGE_INDEX_ENTRY_EXISTS(X) ((X).mode != 0) #define GIT_MERGE_INDEX_ENTRY_ISFILE(X) S_ISREG((X).mode) + +/** Internal merge flags. */ +enum { + /** The merge is for a virtual base in a recursive merge. */ + GIT_MERGE__VIRTUAL_BASE = (1 << 31), +}; + +enum { + /** Accept the conflict file, staging it as the merge result. */ + GIT_MERGE_FILE_FAVOR__CONFLICTED = 4, +}; + + typedef enum { TREE_IDX_ANCESTOR = 0, TREE_IDX_OURS = 1, @@ -801,11 +814,9 @@ static int merge_conflict_resolve_automerge( int *resolved, git_merge_diff_list *diff_list, const git_merge_diff *conflict, - unsigned int merge_file_favor, - unsigned int file_flags) + const git_merge_file_options *file_opts) { const git_index_entry *ancestor = NULL, *ours = NULL, *theirs = NULL; - git_merge_file_options opts = GIT_MERGE_FILE_OPTIONS_INIT; git_merge_file_result result = {0}; git_index_entry *index_entry; git_odb *odb = NULL; @@ -852,12 +863,9 @@ static int merge_conflict_resolve_automerge( theirs = GIT_MERGE_INDEX_ENTRY_EXISTS(conflict->their_entry) ? &conflict->their_entry : NULL; - opts.favor = merge_file_favor; - opts.flags = file_flags; - if ((error = git_repository_odb(&odb, diff_list->repo)) < 0 || - (error = git_merge_file_from_index(&result, diff_list->repo, ancestor, ours, theirs, &opts)) < 0 || - !result.automergeable || + (error = git_merge_file_from_index(&result, diff_list->repo, ancestor, ours, theirs, file_opts)) < 0 || + (!result.automergeable && !(file_opts->flags & GIT_MERGE_FILE_FAVOR__CONFLICTED)) || (error = git_odb_write(&automerge_oid, odb, result.ptr, result.len, GIT_OBJ_BLOB)) < 0) goto done; @@ -887,8 +895,7 @@ static int merge_conflict_resolve( int *out, git_merge_diff_list *diff_list, const git_merge_diff *conflict, - unsigned int merge_file_favor, - unsigned int file_flags) + const git_merge_file_options *file_opts) { int resolved = 0; int error = 0; @@ -904,8 +911,7 @@ static int merge_conflict_resolve( if (!resolved && (error = merge_conflict_resolve_one_renamed(&resolved, diff_list, conflict)) < 0) goto done; - if (!resolved && (error = merge_conflict_resolve_automerge(&resolved, diff_list, conflict, - merge_file_favor, file_flags)) < 0) + if (!resolved && (error = merge_conflict_resolve_automerge(&resolved, diff_list, conflict, file_opts)) < 0) goto done; *out = resolved; @@ -1829,6 +1835,7 @@ int git_merge__iterators( *empty_theirs = NULL; git_merge_diff_list *diff_list; git_merge_options opts; + git_merge_file_options file_opts = GIT_MERGE_FILE_OPTIONS_INIT; git_merge_diff *conflict; git_vector changes; size_t i; @@ -1844,6 +1851,17 @@ int git_merge__iterators( if ((error = merge_normalize_opts(repo, &opts, given_opts)) < 0) return error; + file_opts.favor = opts.file_favor; + file_opts.flags = opts.file_flags; + + /* use the git-inspired labels when virtual base building */ + if (opts.flags & GIT_MERGE__VIRTUAL_BASE) { + file_opts.ancestor_label = "merged common ancestors"; + file_opts.our_label = "Temporary merge branch 1"; + file_opts.their_label = "Temporary merge branch 2"; + file_opts.flags |= GIT_MERGE_FILE_FAVOR__CONFLICTED; + } + diff_list = git_merge_diff_list__alloc(repo); GITERR_CHECK_ALLOC(diff_list); @@ -1862,7 +1880,8 @@ int git_merge__iterators( git_vector_foreach(&changes, i, conflict) { int resolved = 0; - if ((error = merge_conflict_resolve(&resolved, diff_list, conflict, opts.file_favor, opts.file_flags)) < 0) + if ((error = merge_conflict_resolve( + &resolved, diff_list, conflict, &file_opts)) < 0) goto done; if (!resolved) { @@ -1962,16 +1981,27 @@ static int create_virtual_base( git_repository *repo, git_annotated_commit *one, git_annotated_commit *two, + const git_merge_options *opts, size_t recursion_level) { git_annotated_commit *result = NULL; git_index *index = NULL; + git_merge_options virtual_opts = GIT_MERGE_OPTIONS_INIT; result = git__calloc(1, sizeof(git_annotated_commit)); GITERR_CHECK_ALLOC(result); + /* Conflicts in the merge base creation do not propagate to conflicts + * in the result; the conflicted base will act as the common ancestor. + */ + if (opts) + memcpy(&virtual_opts, opts, sizeof(git_merge_options)); + + virtual_opts.flags &= ~GIT_MERGE_FAIL_ON_CONFLICT; + virtual_opts.flags |= GIT_MERGE__VIRTUAL_BASE; + if ((merge_annotated_commits(&index, NULL, repo, one, two, - recursion_level + 1, NULL)) < 0) + recursion_level + 1, &virtual_opts)) < 0) return -1; result->type = GIT_ANNOTATED_COMMIT_VIRTUAL; @@ -1989,7 +2019,7 @@ static int compute_base( git_repository *repo, const git_annotated_commit *one, const git_annotated_commit *two, - bool recurse, + const git_merge_options *opts, size_t recursion_level) { git_array_oid_t head_ids = GIT_ARRAY_INIT; @@ -2007,7 +2037,7 @@ static int compute_base( if ((error = git_merge_bases_many(&bases, repo, head_ids.size, head_ids.ptr)) < 0 || (error = git_annotated_commit_lookup(&base, repo, &bases.ids[0])) < 0 || - !recurse) + (opts && (opts->flags & GIT_MERGE_NO_RECURSIVE))) goto done; for (i = 1; i < bases.count; i++) { @@ -2015,7 +2045,7 @@ static int compute_base( if ((error = git_annotated_commit_lookup(&other, repo, &bases.ids[i])) < 0 || - (error = create_virtual_base(&new_base, repo, base, other, + (error = create_virtual_base(&new_base, repo, base, other, opts, recursion_level)) < 0) goto done; @@ -2076,10 +2106,9 @@ static int merge_annotated_commits( { git_annotated_commit *base = NULL; git_iterator *base_iter = NULL, *our_iter = NULL, *their_iter = NULL; - bool recurse = !opts || !(opts->flags & GIT_MERGE_NO_RECURSIVE); int error; - if ((error = compute_base(&base, repo, ours, theirs, recurse, + if ((error = compute_base(&base, repo, ours, theirs, opts, recursion_level)) < 0) { if (error != GIT_ENOTFOUND) diff --git a/tests/merge/conflict_data.h b/tests/merge/conflict_data.h index b6c51332f..e6394a9e8 100644 --- a/tests/merge/conflict_data.h +++ b/tests/merge/conflict_data.h @@ -70,3 +70,34 @@ "This is a mighty fine recipe!\n" \ ">>>>>>> branchF-2\n" +#define CONFLICTING_RECURSIVE_H1_TO_H2_WITH_DIFF3 \ + "VEAL SOUP.\n" \ + "\n" \ + "<<<<<<< HEAD\n" \ + "put into a pot three quarts of water, three onions cut small, one\n" \ + "||||||| merged common ancestors\n" \ + "<<<<<<< Temporary merge branch 1\n" \ + "Put into a pot three quarts of water, THREE ONIONS CUT SMALL, one\n" \ + "||||||| merged common ancestors\n" \ + "Put into a pot three quarts of water, three onions cut small, one\n" \ + "=======\n" \ + "PUT INTO A POT three quarts of water, three onions cut small, one\n" \ + ">>>>>>> Temporary merge branch 2\n" \ + "=======\n" \ + "Put Into A Pot Three Quarts of Water, Three Onions Cut Small, One\n" \ + ">>>>>>> branchH-2\n" \ + "spoonful of black pepper pounded, and two of salt, with two or three\n" \ + "slices of lean ham; let it boil steadily two hours; skim it\n" \ + "occasionally, then put into it a shin of veal, let it boil two hours\n" \ + "longer; take out the slices of ham, and skim off the grease if any\n" \ + "should rise, take a gill of good cream, mix with it two table-spoonsful\n" \ + "of flour very nicely, and the yelks of two eggs beaten well, strain this\n" \ + "mixture, and add some chopped parsley; pour some soup on by degrees,\n" \ + "stir it well, and pour it into the pot, continuing to stir until it has\n" \ + "boiled two or three minutes to take off the raw taste of the eggs. If\n" \ + "the cream be not perfectly sweet, and the eggs quite new, the thickening\n" \ + "will curdle in the soup. For a change you may put a dozen ripe tomatos\n" \ + "in, first taking off their skins, by letting them stand a few minutes in\n" \ + "hot water, when they may be easily peeled. When made in this way you\n" \ + "must thicken it with the flour only. Any part of the veal may be used,\n" \ + "but the shin or knuckle is the nicest.\n" diff --git a/tests/merge/trees/recursive.c b/tests/merge/trees/recursive.c index 1e5f61391..693c91065 100644 --- a/tests/merge/trees/recursive.c +++ b/tests/merge/trees/recursive.c @@ -297,3 +297,83 @@ void test_merge_trees_recursive__oh_so_many_levels_of_recursion(void) git_index_free(index); } + +/* Branch H-1 and H-2 have two common ancestors (aa9e263, 6ef31d3). The two + * ancestors themselves conflict. + */ +void test_merge_trees_recursive__conflicting_merge_base(void) +{ + git_index *index; + git_merge_options opts = GIT_MERGE_OPTIONS_INIT; + + struct merge_index_entry merge_index_entries[] = { + { 0100644, "ffb36e513f5fdf8a6ba850a20142676a2ac4807d", 0, "asparagus.txt" }, + { 0100644, "68f6182f4c85d39e1309d97c7e456156dc9c0096", 0, "beef.txt" }, + { 0100644, "4b7c5650008b2e747fe1809eeb5a1dde0e80850a", 0, "bouilli.txt" }, + { 0100644, "c4e6cca3ec6ae0148ed231f97257df8c311e015f", 0, "gravy.txt" }, + { 0100644, "68af1fc7407fd9addf1701a87eb1c95c7494c598", 0, "oyster.txt" }, + { 0100644, "3a66812fed1e03ea4a6a7ee28d8a57aec1ca6537", 1, "veal.txt" }, + { 0100644, "d604c75019c282144bdbbf3fd3462ba74b240efc", 2, "veal.txt" }, + { 0100644, "37a5054a9f9b4628e3924c5cb8f2147c6e2a3efc", 3, "veal.txt" }, + }; + + cl_git_pass(merge_commits_from_branches(&index, repo, "branchH-1", "branchH-2", &opts)); + + cl_assert(merge_test_index(index, merge_index_entries, 8)); + + git_index_free(index); +} + +/* Branch H-1 and H-2 have two common ancestors (aa9e263, 6ef31d3). The two + * ancestors themselves conflict. The generated common ancestor file will + * have diff3 style conflicts inside it. + */ +void test_merge_trees_recursive__conflicting_merge_base_with_diff3(void) +{ + git_index *index; + git_merge_options opts = GIT_MERGE_OPTIONS_INIT; + + struct merge_index_entry merge_index_entries[] = { + { 0100644, "ffb36e513f5fdf8a6ba850a20142676a2ac4807d", 0, "asparagus.txt" }, + { 0100644, "68f6182f4c85d39e1309d97c7e456156dc9c0096", 0, "beef.txt" }, + { 0100644, "4b7c5650008b2e747fe1809eeb5a1dde0e80850a", 0, "bouilli.txt" }, + { 0100644, "c4e6cca3ec6ae0148ed231f97257df8c311e015f", 0, "gravy.txt" }, + { 0100644, "68af1fc7407fd9addf1701a87eb1c95c7494c598", 0, "oyster.txt" }, + { 0100644, "cd17a91513f3aee9e44114d1ede67932dd41d2fc", 1, "veal.txt" }, + { 0100644, "d604c75019c282144bdbbf3fd3462ba74b240efc", 2, "veal.txt" }, + { 0100644, "37a5054a9f9b4628e3924c5cb8f2147c6e2a3efc", 3, "veal.txt" }, + }; + + opts.file_flags |= GIT_MERGE_FILE_STYLE_DIFF3; + + cl_git_pass(merge_commits_from_branches(&index, repo, "branchH-1", "branchH-2", &opts)); + + cl_assert(merge_test_index(index, merge_index_entries, 8)); + + git_index_free(index); +} + +/* Branch I-1 and I-2 have two common ancestors (aa9e263, 6ef31d3). The two + * ancestors themselves conflict, but when each was merged, the conflicts were + * resolved identically, thus merging I-1 into I-2 does not conflict. + */ +void test_merge_trees_recursive__conflicting_merge_base_since_resolved(void) +{ + git_index *index; + git_merge_options opts = GIT_MERGE_OPTIONS_INIT; + + struct merge_index_entry merge_index_entries[] = { + { 0100644, "ffb36e513f5fdf8a6ba850a20142676a2ac4807d", 0, "asparagus.txt" }, + { 0100644, "68f6182f4c85d39e1309d97c7e456156dc9c0096", 0, "beef.txt" }, + { 0100644, "4b7c5650008b2e747fe1809eeb5a1dde0e80850a", 0, "bouilli.txt" }, + { 0100644, "c4e6cca3ec6ae0148ed231f97257df8c311e015f", 0, "gravy.txt" }, + { 0100644, "68af1fc7407fd9addf1701a87eb1c95c7494c598", 0, "oyster.txt" }, + { 0100644, "a02d4fd126e0cc8fb46ee48cf38bad36d44f2dbc", 0, "veal.txt" }, + }; + + cl_git_pass(merge_commits_from_branches(&index, repo, "branchI-1", "branchI-2", &opts)); + + cl_assert(merge_test_index(index, merge_index_entries, 6)); + + git_index_free(index); +} diff --git a/tests/merge/workdir/recursive.c b/tests/merge/workdir/recursive.c index a7326009a..795126255 100644 --- a/tests/merge/workdir/recursive.c +++ b/tests/merge/workdir/recursive.c @@ -36,7 +36,6 @@ void test_merge_workdir_recursive__writes_conflict_with_virtual_base(void) { 0100644, "3855170cef875708da06ab9ad7fc6a73b531cda1", 3, "veal.txt" }, }; - cl_git_pass(merge_branches(repo, GIT_REFS_HEADS_DIR "branchF-1", GIT_REFS_HEADS_DIR "branchF-2", &opts, NULL)); cl_git_pass(git_repository_index(&index, repo)); @@ -49,3 +48,37 @@ void test_merge_workdir_recursive__writes_conflict_with_virtual_base(void) git_index_free(index); git_buf_free(&conflicting_buf); } + +void test_merge_workdir_recursive__conflicting_merge_base_with_diff3(void) +{ + git_index *index; + git_merge_options opts = GIT_MERGE_OPTIONS_INIT; + git_checkout_options checkout_opts = GIT_CHECKOUT_OPTIONS_INIT; + git_buf conflicting_buf = GIT_BUF_INIT; + + struct merge_index_entry merge_index_entries[] = { + { 0100644, "ffb36e513f5fdf8a6ba850a20142676a2ac4807d", 0, "asparagus.txt" }, + { 0100644, "68f6182f4c85d39e1309d97c7e456156dc9c0096", 0, "beef.txt" }, + { 0100644, "4b7c5650008b2e747fe1809eeb5a1dde0e80850a", 0, "bouilli.txt" }, + { 0100644, "c4e6cca3ec6ae0148ed231f97257df8c311e015f", 0, "gravy.txt" }, + { 0100644, "68af1fc7407fd9addf1701a87eb1c95c7494c598", 0, "oyster.txt" }, + { 0100644, "cd17a91513f3aee9e44114d1ede67932dd41d2fc", 1, "veal.txt" }, + { 0100644, "d604c75019c282144bdbbf3fd3462ba74b240efc", 2, "veal.txt" }, + { 0100644, "37a5054a9f9b4628e3924c5cb8f2147c6e2a3efc", 3, "veal.txt" }, + }; + + opts.file_flags |= GIT_MERGE_FILE_STYLE_DIFF3; + checkout_opts.checkout_strategy |= GIT_CHECKOUT_CONFLICT_STYLE_DIFF3; + + cl_git_pass(merge_branches(repo, GIT_REFS_HEADS_DIR "branchH-1", GIT_REFS_HEADS_DIR "branchH-2", &opts, &checkout_opts)); + + cl_git_pass(git_repository_index(&index, repo)); + cl_assert(merge_test_index(index, merge_index_entries, 8)); + + cl_git_pass(git_futils_readbuffer(&conflicting_buf, "merge-recursive/veal.txt")); + + cl_assert_equal_s(CONFLICTING_RECURSIVE_H1_TO_H2_WITH_DIFF3, conflicting_buf.ptr); + + git_index_free(index); + git_buf_free(&conflicting_buf); +} diff --git a/tests/resources/merge-recursive/.gitted/objects/15/311229e70fa62653f73dde1d4deef1a8e47a11 b/tests/resources/merge-recursive/.gitted/objects/15/311229e70fa62653f73dde1d4deef1a8e47a11 new file mode 100644 index 0000000000000000000000000000000000000000..8c21bb357b2e5b67ef00d764c0b31886e4b19acb GIT binary patch literal 710 zcmV;%0y+J70i9Iaj?*v@<=I~`A5bcB5fUmORZz4mE!&FSg=Z(3G*%ru>v0G{d^~5I z7I;MXskJ>b=jK#CR`l%o>z7Zy?6x;_w|_XSjd`;yy4r0&n8U+8UEkjCX-kLwJ>@Pj z)8lAU7K$xRHgj5?w_|WI2-RaI>87mz24v6(RP^J8KwOs)mR*$6uMhLRHo4DDm-=zJ087$Z!@b+qZ-_eBAKQvlgko}U&O z1v(laZ9OOgZ<;AU80A$&1g4q&sR*T|d^`$OjCci_ShFNKS+LEW6N5o{OaP;`wrNOW z&s292_B1ruB%bGu`jnOi^KM(lX4?W`EJ5mQSJ&aOj=FlN|}f<^bUuE|c=famI(PEej}x^9jBDKdgJ1v~@< zt>ro+88R^g$3>?i&Ex3MB=A&np{mp;4!~$8HKra@yp4pds6P_Xh1V0CCEy(MB*R~bm_Qg)K0v6%kS0w9qzZ~QX{-|)@a!g+#;RjyK8Fy*hv#=r z3%r2vQ)~O~e*c`kk9&G?adr9Z^LBGf54%tID`Q?Qi>|kucjkV~QX^5F}mze2k zv?&Y4mL{7yRrGlMal576-OcXqf!=<4q=yfi+uMp_VDn>H)N?v;Lv`%?7|4d2CC4QH zIbj(bgNs3^1}N#R_sfLW%QE*Ed~^4>qYd5f9{+~*U!C48i>$rki_4crh8ROTdZoJe zwm#Cp!@vnzjG^JC0*{9B6!n5wpDUVN?v|ajATZ(`xatkhHc)5#HGVrC*M$V!hoTDEFGLL!W?3Rt+~sf=Wo)P|+Kb}IL=QzEZ2A@mh8 z8?pLUkWG?N-rkE!wSPxXS^V85dGF~PUG zv&aL@airePB~O-`_#HYYH!u+QHb*foRMfg8aMB)?`zadG3`q%6sg_6_q=7CS_fV#| zK`l?e_`6^_a5;S_CQUHz&Sf-sB4ir5BwmAWJg2Gv$ntoIu3(4YHd1s)u x20ZmiOuG26OW$mw+4+s@3SfH*d1k#m|T6BTCc9KbA#j%6OCWNo&jMDVGs)~06qwj`R)7qM_6GAf&{vQ)tVR8c~?nW@l_mrG4 zVCWo6qw`gmF~*)clw-`|ejN$`oC3(U_58ZZDA3UW>EJ;Tc+*Y+!YHpQA~5aj=PH!8 z@;C~$43h$Ftd2-d7Hsq6#9&b_31GC>_B}~ln7S##o}N~l#PfbupVIM5Vp%B$YIo`x zrf(;4BOFg z=ziBV*$ofyTwT)*%JW1|gVB#FBUn>FU=g%|yNqPW#ta+}ovJiHio=k=Tg`>4(#;%z z(QIl=S5oicpXvp-!Tv;_VuEkoWRVBjW1+?FHBXlM_!~MWw=xhfHb*foG&Hy*aMI4o z{T>ZyhNJ{(R7)fd(m5GG{O}FfcPQQAjKg*oR}_y-IlIB-C7+5<={A$BEp;heVaG-?`m~s}LV~uvbi@u*}<#pvutJE~`a3Y@uDx25^^|7323uQV^ z^3mF93_Z7rk$s}cFBghjC=}`>MAE{32yt&!lhmvi(m5=+;H2-pLKzh8CY2MdkQh=C ztM{Z+NH+W@duaZ@t*L6=T$FU>e4*lJCP6v+&_7iWbogjPWgOf8Yi6%ZVT8rqDLTc0 za!`g0>*MJfVgqv(8K}o~v{}Nhg8;;tfa1HzZyQDhM+c>2ghlAhJ0*ZIUkxHO?HuO@ z%1ZfqRq7ZaCEC~$(ULvfmMN&ipi(o$SgjuhQdyY#Nf6IKtIryFzgSNB_@z=;WJ=vm z1H&Ba$!Q7MFdpr#Q@f9o2G}sIf=qi!C8QeCmB77KRh&etoxD1W5mVb9+)@XLR10E9 z!NL8;HTw+*$lOx13Fh-m_oK6qh7qnQNx`n=k^6$p(2W^7UO6>1FEyY^;;rq4QR!z+ z(C9V`rmuO3$j^8oZMZ+vXUWK|pFH+~cB!=Zz3r2yL4JdC4l6_P;)|#Y=|p45iX{DP z-fyb`X4sUZCu50?0~&CdcmbJ~293P^^&gU(;N|w%Hrrs_-P>sR#FE+SugoBLrXTiy z@xx7cP!#Sa)h*S8941?4?VZ8eu}_lXex|#GR(Rj9Z0%LNPO6Ic>blqUZ|^44oN7NC RCnSYtwvk%S?hhNSg)?_+K#TwY literal 0 HcmV?d00001 diff --git a/tests/resources/merge-recursive/.gitted/objects/56/07a8c4601a737daadd1f470bde3142aff57026 b/tests/resources/merge-recursive/.gitted/objects/56/07a8c4601a737daadd1f470bde3142aff57026 new file mode 100644 index 0000000000000000000000000000000000000000..bf3639d054dc4d200f0af55ac962784c6a7b02bc GIT binary patch literal 206 zcmV;<05Sh~0i};kN(C_xgk8@m`T`^A&ObcFjf=N%=LI^Qj`J2Xk-Ui4cLY6w)TZjA zC@AUsew$!Tc$h;Kazcq&i%lL=wTV!pEd_n9;_!5iY6$3-4<33H8C)b1_GXA;D_AG0REMV^jYzvApVdS15xI+2Fbo+>Y6Q^L54L I8zXXJRt8>Zb^rhX literal 0 HcmV?d00001 diff --git a/tests/resources/merge-recursive/.gitted/objects/63/e8773becdea9c3699c95a5740be5baa8be8d69 b/tests/resources/merge-recursive/.gitted/objects/63/e8773becdea9c3699c95a5740be5baa8be8d69 new file mode 100644 index 0000000000000000000000000000000000000000..6d5c320fe3eafb23ef1b8056324cabfef9ee5260 GIT binary patch literal 207 zcmV;=05Jb}0V^p=O;s>5GG{O}FfcPQQAjKKwxdU$y}81q;%xsW4ST4JU=CT4mqHf5nW&}uWMhMvEC zyS=4{`@4txC;IgAOiy2LPN#-qU?WS6VJKd&x88OWExat8fLB7#eM2_%l-H;i#QNOO z>hidsqepG` z&~jCUc}p_7pv!-<_04~<%BrFnAH$i`k+PkbBF2G3|5$<0uA?rE!%+X96I)?&10-%n zfaH5hP8c*4$I{vPYRoyto;q9y%Qupr*V)mE(HOC{_TZ8_ zoCqZ&b`0#kUwln=#Q`$c)O3UDJkZ@>^rPAc)f7-z6m8%xqZzU?gU8jUYRzkL013R- zUZ^YG!~q=5s=;(6^&a`DUq~D35A-=EMI$Gc^qwc>Sy21v5g+<*}{WVBFp6YUo7CwE7D( z96Znu{Xg6OLfi=kH>GOkqC|F)HM9E8AZ_nc41PP%O#l?$_tjf{71vEg@Lo-Ot$%$t WiKbAxNqs_60MkZFKA1nlLWC2#0zgav literal 0 HcmV?d00001 diff --git a/tests/resources/merge-recursive/.gitted/objects/6e/f31d35a3f5abc1e24f4f9afa5cb2016f03fa2d b/tests/resources/merge-recursive/.gitted/objects/6e/f31d35a3f5abc1e24f4f9afa5cb2016f03fa2d new file mode 100644 index 0000000000000000000000000000000000000000..e95a5e2dbbd6dc272ecd7ede4fd4f4ea377a0919 GIT binary patch literal 174 zcmV;f08#&V0i};YP6Z(l1zmHBzJR7-Xc`h@-25AO0iYZIBr+HV_4OiW}x^VDMjS1v7*CXUUDjTI?`#^}V= z!W=?LHHvR0f35qNaFd@r1>WwXpW}dMz3d;o_Px$=j<%la=r3Ts=frN?EIcA1n#*28 cm;NJRZgO4y*8Bnc0bS?2LdmC^Un=cTR;<=k5&!@I literal 0 HcmV?d00001 diff --git a/tests/resources/merge-recursive/.gitted/objects/7a/9277e0c5ec75339f011c176d0c20e513c4de1c b/tests/resources/merge-recursive/.gitted/objects/7a/9277e0c5ec75339f011c176d0c20e513c4de1c new file mode 100644 index 0000000000000000000000000000000000000000..9fb34f7eedd4a615198879a383fff0484b21e1a2 GIT binary patch literal 202 zcmV;*05$)30i{ntPDLRQbNx=i1-^lq0X~T_ZcN;`^8&*#_}+qt;bXkMxX=rjZrY}4 zQ|YZ8)1dWtbEp~uqT)~?XThs?7Qqr>&e>Y5m_jTL2*dWlL(gfLlR`j9R14IwP?9KT zK;f$>DuZaW@i!l|qATbbtLH3EfhyI+mAz!JF4Q%{P&WRYdmrYxeDNseZSU>YPxGM5 z{b5h-kkN0w&U@+Y(Kw=*B2e_^V!gH7a@Vn`|ESnrb-b&|gHPFCE?|yx_CM*iZ!lP4 Eqh?`iumAu6 literal 0 HcmV?d00001 diff --git a/tests/resources/merge-recursive/.gitted/objects/88/8588a782ad433fbf0cc526e07cfe6f4a6b60b3 b/tests/resources/merge-recursive/.gitted/objects/88/8588a782ad433fbf0cc526e07cfe6f4a6b60b3 new file mode 100644 index 0000000000000000000000000000000000000000..44efd3315b4326a3f381c0ce6633451ce0b1ef91 GIT binary patch literal 208 zcmV;>05AV|0V^p=O;s>5GG{O}FfcPQQAjK05AV|0V^p=O;s>5GG{O}FfcPQQAjKEU!e(}AAOSGsFAq@=c?o z@lIR2R={INbH=DkUgkB$!8n2b$=X)`!3wK_rmS~8hdm`dGI@*xhyJkwp-o3w>btId z?*r?|WI9M(RRof4DVWHhAvl_PV~a7p_boNJ4w%XO+8h8mA&_)!`E9W=!bb(BorOg3 z4J$bqBf5%-;Iy(Gi%~MleIKc2ouGMP3w1FC4Yg@7QDITa0c2!Ww=G3KF*SonJT1*S zM9b@5athn0=<`h8QN2>j5XZ4nF_|DXZt#Ls?&G8wEH=#^nKs@fr;=&9b zcb|$iKe7RcRS0W8c16-eS26m%ajNX&p z+CITYe3(NOm^m_MVxMbRS1X1h(I-U`(_|s1lCZ4qGY>r`kWev>x)Iw_7Z!{u8KJLU z3Qt+Awwe2$c*=;^aZ!fTfKpXiLH+aN|=q`H= do%)Z2yVdLJx8@Jn4`@2x6-qwU{Q?TRQDDTZQfvSK literal 0 HcmV?d00001 diff --git a/tests/resources/merge-recursive/.gitted/objects/b9/1ef5ffa8612616c8e76051901caafd723f0e2c b/tests/resources/merge-recursive/.gitted/objects/b9/1ef5ffa8612616c8e76051901caafd723f0e2c new file mode 100644 index 0000000000000000000000000000000000000000..e19652394fafa04eeadf6101eab837e67cb1c51c GIT binary patch literal 712 zcmV;(0yq750gY76j?*v@=Ip1K2MCo|aak3RDk$2OmTko@aCVbPW7V;<9)}Rb!}E>P z0v8ZIwYF#G`*RLH9_Yo@^~-0Ux0^e9*nQfsjCr*zy4h~tnf;i_g&fJ!5Hsa2G1Jp% zQx=LXO*V6?=<(*`c1yea+ui*Gz5Vn^4<9yncNN9J=Et(A=XB(T>e%-&kPS6Uj!FJ= z!ZJ7p7lTj@P|{oPmkFW6{9v{YRSRbbtnOT{yeRq_OJQS&u^q;^Fzm zX@Micr`Gn&e1Fct#{*rxdVTZa%VvE~kK3o+(wH~%qT9{-gV{ap>F!~_r8Vugd&+HM zrsu(?EEF3WZRWH%Z^z(b5UPeu(pm2p6a$-|^P-N^k!z}A*Tq0KR4h3rF*{s$AxE;* z$NWDN-p=bEJMC{jZ#J}jxZ6HF(tFT*{ItHmpRvB17u|4keN|r@>0=Dd;FapZ+v-F; z_dO>d9YW3Z0z7KUW7G>`eO}P$ay##&nTrwcz*TQ}wt-sPt?&z^GaaJyB$;jP{8Xyi zI3!t-oLq+sCRUXds0uYFm6-$e7rjt#Nm>`Q^*6TA`|q}js&q3xh9jpHWqV?ZC`TXq zg9?CV9%X23nsRTMFw(@K3x^O3}%M;_@gQOzL7vM`ceQXA&>+Ns>fP6?#Sgh(!s*^pfr zTsRVPTB-)@c&%-%7_|{oOAgMiLy0hC*p7l(_p`3aj@W?b>Y7eao=duGjQ%Myf;9y^ z1q7|(DkB*(G6Tm&ry|Ys;Ls%SSaPANR3{F=Xht=r8dB}ypXvp-!G1{}V}fs0Ymo<< z;y|69N}ep$@dtEHu4f?bY>r}FSWx4Vz)5>j?&oMgGbAO*LbXKVAPsbBxq~vr4QhD& z&EEyng3I|sF=~QwcPgX76Cu;+_smdmNniE6v-KIc6BJGg)pUabnMoGU$~yzKIZrY8 uX-VsVR`@nuwAEK}nKTIAt2tcaU*1ikQy8j~>IA3IOcN=2X?_9!X2$$2(9 literal 0 HcmV?d00001 diff --git a/tests/resources/merge-recursive/.gitted/objects/d6/04c75019c282144bdbbf3fd3462ba74b240efc b/tests/resources/merge-recursive/.gitted/objects/d6/04c75019c282144bdbbf3fd3462ba74b240efc new file mode 100644 index 0000000000000000000000000000000000000000..059fcfe72f6598e0a631ed1165559606dacc47cc GIT binary patch literal 620 zcmV-y0+aoC0Zmi8uGBCPrS@0M2ZR+A6lkkkfP{nu5(4T;GTB&h>|Bpc2w%?`XZJ!G z$8+Yq+=tZD+c)puz54Ot=`(%%^8M?@xvduRu_R*JQlTh&?eg^8F)30GIqpqq_QWwpd3m^yD#&3l22%-!4J|l z2H{9EuU85JYK8jb18ET+eK^|GoNCr9>Ec&haA_D=!3>NJqbiYJRAHV;XCH0(FJW;0 zAJ$kkG#665Nxo9yMJPcbaOfW^5IS|VrD>Yl|63MTAwNOl;S@+=r0i8d!*G~xJ~U%) zDUCGXI$&1+`*Z;0j6mT&$m?dK!bbno%|?x0_Ng2r1Go zmWYy}M%p-QkmG7O<@1-Ox*=2Q4;lsHL_4R&XN%#4 zH>7qSC#^PS6N=N(kYe$%`gkL>sZCX!1e={%oyCZ)tq1qi;Y6$jv18!${qAe#9S6wV zQnL-F^Fp5{XCKW*sHTX*qG*#01)})ML^+wKfJY9@z_)q@748>`nPwJX^C}M%qJuTFl(fii~9@Y GSca3)DKNPJ literal 0 HcmV?d00001 diff --git a/tests/resources/merge-recursive/.gitted/objects/db/203155a789fb749aa3c14e93eea2c744a9c6c7 b/tests/resources/merge-recursive/.gitted/objects/db/203155a789fb749aa3c14e93eea2c744a9c6c7 new file mode 100644 index 0000000000000000000000000000000000000000..e9f7fd8fd7656e004a2ba597912eaf83108fe564 GIT binary patch literal 204 zcmV;-05ku10i};kN(C_xgk9$pxxkYoonH`f^T3TeFVN|9JG00{^78Qdjtjkj)TZjA zC@31e?@NOT4{I{(2%J-b%G4MOK`ezzz>vJD94cb2oLemF6DJ=_M;5RR0)hmrWZ8M~ zQcy5Zb;d?9An4j}AF;5D;EI>#B%W%87^?%qObm>UIGLpIzP2&-wSD1i`h6SyHV*y7 zC;f3ReWy8YL)IgW{;aL{sU+uZ))y0uQ71i*E&j)ZdgJ-Qx=uW3d%ak_A8Y(Yr@jFK GTw_|HHDY)G literal 0 HcmV?d00001 diff --git a/tests/resources/merge-recursive/.gitted/objects/e1/512550f09d980214e46e6d3f5a2b20c3d75755 b/tests/resources/merge-recursive/.gitted/objects/e1/512550f09d980214e46e6d3f5a2b20c3d75755 new file mode 100644 index 0000000000000000000000000000000000000000..a5f506fb30b11082e62870bbc305d849e835ca39 GIT binary patch literal 208 zcmV;>05AV|0V^p=O;s>5GG{O}FfcPQQAjK%)+xKmNHQ{M=RY(g;Oq%WDaVd5o)M#@?pNcpbslTxshTrE_?sgguFlNDY>tul#56DR%}YwK_=5AFrt*S6o= z0T(^#k9*xW>FwU?c$T)m06G^_q=*4#v78DTp{`^~qR Jrf(5uVo0VDWGVmv literal 0 HcmV?d00001 diff --git a/tests/resources/merge-recursive/.gitted/refs/heads/branchH-1 b/tests/resources/merge-recursive/.gitted/refs/heads/branchH-1 new file mode 100644 index 0000000000000000000000000000000000000000..ffe9f8cf35a13fc79489c4e6ea51fd88579a45ba GIT binary patch literal 41 ucmV~$!4Uu;2m`Rc(@+q5jN=vDe*_cWa&k;LVn)<6K;UVU+ayA}2U;KEJPN=7 literal 0 HcmV?d00001 diff --git a/tests/resources/merge-recursive/.gitted/refs/heads/branchH-2 b/tests/resources/merge-recursive/.gitted/refs/heads/branchH-2 new file mode 100644 index 0000000000000000000000000000000000000000..84ed1a2a91c23935402e15ebcb40c3340dfa3261 GIT binary patch literal 41 ucmV~$K>+|D2m`>sX%vP?oPpRsf_FD%>N2CBcVF?#sMn!AEEYw!tn}}^&6%bwypg#0}fHDRM`3G8VXqe literal 0 HcmV?d00001