From fccad82ee8f431e06097b3a1282228b40ae7128f Mon Sep 17 00:00:00 2001
From: Edward Thomson <ethomson@edwardthomson.com>
Date: Tue, 27 Oct 2015 14:23:35 -0500
Subject: [PATCH] merge: add recursive test with three merge bases

---
 tests/merge/trees/recursive.c                 |  46 ++++++++++++++++++
 .../06/db153c36829fc656e05cdf5a3bf7183f3c10aa | Bin 0 -> 272 bytes
 .../0e/8126647ec607f0a14122cec4b15315d790c8ff | Bin 0 -> 208 bytes
 .../1c/1bdb80c04233d1a9b9755913ee233987be6175 | Bin 0 -> 208 bytes
 .../1e/8dff96faaaa24f84943d2d9601dde61cb0398a | Bin 0 -> 268 bytes
 .../43/6ea75c99f527e4b42fddb46abedf7726eb719d | Bin 0 -> 173 bytes
 .../5a/ba269b3be41fc8db38068d3948c8af543fe609 | Bin 0 -> 208 bytes
 .../73/b20c8e09fa2726d69ff66969186014165da3c3 | Bin 0 -> 208 bytes
 .../7e/3056f6765b3044ab09701077dbe1eb5b0e9ad0 | Bin 0 -> 208 bytes
 .../8a/bda8de114a93f2d3c5a975ee2960f31e24be58 | Bin 0 -> 169 bytes
 .../96/23368f0fc562d6d840372ae17dc4cc32d51a80 | Bin 0 -> 172 bytes
 .../9a/e63b4a8ce0f181b2d1d098971733a103226917 | Bin 0 -> 240 bytes
 .../9b/258ad4c39f40c24f66bf1faf48eb6202d59c85 | Bin 0 -> 240 bytes
 .../9e/12bce04446d097ae1782967a5888c2e2a0d35b | Bin 0 -> 268 bytes
 .../a2/8c21c90aa36580641b345011869d1a899a6783 | Bin 0 -> 239 bytes
 .../ad/98bfa4679fb00b89207a0a11b8bbf91a3e4de9 | Bin 0 -> 208 bytes
 .../bd/97980c22d122509cdd915fd9788d56c8d3ae20 | Bin 0 -> 163 bytes
 .../ca/224bba0a8a24f1768804fe5f565b1014af7ef2 | Bin 0 -> 170 bytes
 .../d2/682aaf9594080ce877b5eeee110850fd6e3480 | Bin 0 -> 272 bytes
 .../d8/dd349b78f19a4ebe3357bacb8138f00bf5ed41 | Bin 0 -> 277 bytes
 .../d8/e05a90b3c2240d71a20c2502c937d9b7d22777 | Bin 0 -> 272 bytes
 .../da/b7b53383a1fec46632e60a1d847ce4f9ae14f2 | Bin 0 -> 208 bytes
 .../e2/d185fa827d58134cea20b9e1df893833c6560e | Bin 0 -> 208 bytes
 .../e5/0fbbd701458757bdfe9815f58ed717c588d1b5 | Bin 0 -> 268 bytes
 .../f1/72517a8cf39e009ffff541ee52429b89e418f3 | Bin 0 -> 268 bytes
 .../.gitted/refs/heads/branchE-1              | Bin 0 -> 41 bytes
 .../.gitted/refs/heads/branchE-2              | Bin 0 -> 41 bytes
 .../.gitted/refs/heads/branchE-3              | Bin 0 -> 41 bytes
 28 files changed, 46 insertions(+)
 create mode 100644 tests/resources/merge-recursive/.gitted/objects/06/db153c36829fc656e05cdf5a3bf7183f3c10aa
 create mode 100644 tests/resources/merge-recursive/.gitted/objects/0e/8126647ec607f0a14122cec4b15315d790c8ff
 create mode 100644 tests/resources/merge-recursive/.gitted/objects/1c/1bdb80c04233d1a9b9755913ee233987be6175
 create mode 100644 tests/resources/merge-recursive/.gitted/objects/1e/8dff96faaaa24f84943d2d9601dde61cb0398a
 create mode 100644 tests/resources/merge-recursive/.gitted/objects/43/6ea75c99f527e4b42fddb46abedf7726eb719d
 create mode 100644 tests/resources/merge-recursive/.gitted/objects/5a/ba269b3be41fc8db38068d3948c8af543fe609
 create mode 100644 tests/resources/merge-recursive/.gitted/objects/73/b20c8e09fa2726d69ff66969186014165da3c3
 create mode 100644 tests/resources/merge-recursive/.gitted/objects/7e/3056f6765b3044ab09701077dbe1eb5b0e9ad0
 create mode 100644 tests/resources/merge-recursive/.gitted/objects/8a/bda8de114a93f2d3c5a975ee2960f31e24be58
 create mode 100644 tests/resources/merge-recursive/.gitted/objects/96/23368f0fc562d6d840372ae17dc4cc32d51a80
 create mode 100644 tests/resources/merge-recursive/.gitted/objects/9a/e63b4a8ce0f181b2d1d098971733a103226917
 create mode 100644 tests/resources/merge-recursive/.gitted/objects/9b/258ad4c39f40c24f66bf1faf48eb6202d59c85
 create mode 100644 tests/resources/merge-recursive/.gitted/objects/9e/12bce04446d097ae1782967a5888c2e2a0d35b
 create mode 100644 tests/resources/merge-recursive/.gitted/objects/a2/8c21c90aa36580641b345011869d1a899a6783
 create mode 100644 tests/resources/merge-recursive/.gitted/objects/ad/98bfa4679fb00b89207a0a11b8bbf91a3e4de9
 create mode 100644 tests/resources/merge-recursive/.gitted/objects/bd/97980c22d122509cdd915fd9788d56c8d3ae20
 create mode 100644 tests/resources/merge-recursive/.gitted/objects/ca/224bba0a8a24f1768804fe5f565b1014af7ef2
 create mode 100644 tests/resources/merge-recursive/.gitted/objects/d2/682aaf9594080ce877b5eeee110850fd6e3480
 create mode 100644 tests/resources/merge-recursive/.gitted/objects/d8/dd349b78f19a4ebe3357bacb8138f00bf5ed41
 create mode 100644 tests/resources/merge-recursive/.gitted/objects/d8/e05a90b3c2240d71a20c2502c937d9b7d22777
 create mode 100644 tests/resources/merge-recursive/.gitted/objects/da/b7b53383a1fec46632e60a1d847ce4f9ae14f2
 create mode 100644 tests/resources/merge-recursive/.gitted/objects/e2/d185fa827d58134cea20b9e1df893833c6560e
 create mode 100644 tests/resources/merge-recursive/.gitted/objects/e5/0fbbd701458757bdfe9815f58ed717c588d1b5
 create mode 100644 tests/resources/merge-recursive/.gitted/objects/f1/72517a8cf39e009ffff541ee52429b89e418f3
 create mode 100644 tests/resources/merge-recursive/.gitted/refs/heads/branchE-1
 create mode 100644 tests/resources/merge-recursive/.gitted/refs/heads/branchE-2
 create mode 100644 tests/resources/merge-recursive/.gitted/refs/heads/branchE-3

diff --git a/tests/merge/trees/recursive.c b/tests/merge/trees/recursive.c
index bff5d7e39..46effa5c2 100644
--- a/tests/merge/trees/recursive.c
+++ b/tests/merge/trees/recursive.c
@@ -200,3 +200,49 @@ void test_merge_trees_recursive__three_levels_of_multiple_bases_norecursive(void
 	git_index_free(index);
 }
 
+void test_merge_trees_recursive__three_base_commits(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, "c4f7269b07c76d02755d75ccaf05c0b4c36cdc6c", 0, "gravy.txt" },
+		{ 0100644, "68af1fc7407fd9addf1701a87eb1c95c7494c598", 0, "oyster.txt" },
+		{ 0100644, "a7b066537e6be7109abfe4ff97b675d4e077da20", 0, "veal.txt" },
+	};
+
+	cl_git_pass(merge_commits_from_branches(&index, repo, "branchE-1", "branchE-2", &opts));
+
+	cl_assert(merge_test_index(index, merge_index_entries, 6));
+
+	git_index_free(index);
+}
+
+void test_merge_trees_recursive__three_base_commits_norecursive(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, "9e12bce04446d097ae1782967a5888c2e2a0d35b", 1, "gravy.txt" },
+		{ 0100644, "d8dd349b78f19a4ebe3357bacb8138f00bf5ed41", 2, "gravy.txt" },
+		{ 0100644, "e50fbbd701458757bdfe9815f58ed717c588d1b5", 3, "gravy.txt" },
+		{ 0100644, "68af1fc7407fd9addf1701a87eb1c95c7494c598", 0, "oyster.txt" },
+		{ 0100644, "a7b066537e6be7109abfe4ff97b675d4e077da20", 0, "veal.txt" },
+	};
+
+	opts.flags |= GIT_MERGE_NO_RECURSIVE;
+
+	cl_git_pass(merge_commits_from_branches(&index, repo, "branchE-1", "branchE-2", &opts));
+
+	cl_assert(merge_test_index(index, merge_index_entries, 8));
+
+	git_index_free(index);
+}
+
diff --git a/tests/resources/merge-recursive/.gitted/objects/06/db153c36829fc656e05cdf5a3bf7183f3c10aa b/tests/resources/merge-recursive/.gitted/objects/06/db153c36829fc656e05cdf5a3bf7183f3c10aa
new file mode 100644
index 0000000000000000000000000000000000000000..85887e0f532f756c021a17fed77a7e867fe9d146
GIT binary patch
literal 272
zcmV+r0q_2J0VPnoZo@zf>wI6q4@iOnor+GGiY|R6DUeaNW&42h$vDX|^7qv_n?O<|
zr6x&(m)GZ~_uu2+6{oMu_aTILHgFt9!z@eg6w;#=D#}Pq84Yv4->;-2qM_X|${iBj
zD-bj8vXn53?JzGJU?W3mVkd{fUF2*EQuI==aiedkEb|U)wDEztKKxvcpXZPBwRTv^
zxa?4)dPzyvO*R*4SruI@+!|M|dXgP*vO@0b0ik;PP-GcK5H#|QA6Clc=DiFqsJD2+
zRw0XdsR5G|u6{X~kk){vFm?6JXm7ApVALeu>nxJBUsCNlE$U%1p(RsyUSmq2t^<WW
WW=5ar=1+q8cKwalJA{7(D~q2M(}YU^

literal 0
HcmV?d00001

diff --git a/tests/resources/merge-recursive/.gitted/objects/0e/8126647ec607f0a14122cec4b15315d790c8ff b/tests/resources/merge-recursive/.gitted/objects/0e/8126647ec607f0a14122cec4b15315d790c8ff
new file mode 100644
index 0000000000000000000000000000000000000000..c99a6865c2694d0e01ab408d95c2303c75596416
GIT binary patch
literal 208
zcmV;>05AV|0V^p=O;s>5GG{O}FfcPQQAjK<NGwWBFD=$9sVHIizd0|^KK_1J_KJW-
zj85rUT1Ogcp$d~yQ`5j|GQLUZ`?Ox3C(L=Xrp`4n?9Lp9X)rbUrI|T7nP6q!HDLh^
z-FhYU4;$vaj*`8{*U-uZRhC|qSXK#E^pt=1bw=0r@V)<Lh<@$6E`GG*;#R1l{L12z
z)FOzD>*bF-)ZbitUz~A8-NutKB~y;hfT}7>P0RtSS-v4HxGwv-z^wgG{!ialdgVd+
KEd>DYnqMw)Z)Roy

literal 0
HcmV?d00001

diff --git a/tests/resources/merge-recursive/.gitted/objects/1c/1bdb80c04233d1a9b9755913ee233987be6175 b/tests/resources/merge-recursive/.gitted/objects/1c/1bdb80c04233d1a9b9755913ee233987be6175
new file mode 100644
index 0000000000000000000000000000000000000000..a2146496decf282eba468c692c6f7e10bf64d1c0
GIT binary patch
literal 208
zcmV;>05AV|0V^p=O;s>5GG{O}FfcPQQAjK<NGwWBFD=$9sVHIizd0|^KK_1J_KJW-
zj85rUT1Ogcp$d~yQ`5j|GQLUZ`?Ox3C(L=Xrp`4n?9Lp9X)rbUrI|T7nP6q!HDLh^
z-FhYU4;$vaj*`8{*U-uZRhC|qSXK#EbSXn?{nRNOJTJ<(zI!Lg5%4$9qyefZzp}U_
zwFqM4dimoH^*7hv7iU~ixAA05$&{lrpsLDJ6LY|7mTyQ4uFHNdFl+yl|I@dXUU^V{
KO923Muw9_30$;TN

literal 0
HcmV?d00001

diff --git a/tests/resources/merge-recursive/.gitted/objects/1e/8dff96faaaa24f84943d2d9601dde61cb0398a b/tests/resources/merge-recursive/.gitted/objects/1e/8dff96faaaa24f84943d2d9601dde61cb0398a
new file mode 100644
index 0000000000000000000000000000000000000000..b6185f29441cd24b94406d5de4189be60ec02a27
GIT binary patch
literal 268
zcmV+n0rUQN0VPl|Zo@DP?5tN@_M|A#sp!-xV~YeW(2=%jTYxOOA{8UQFXe2+-SO_o
zE=h;ix0k2$<>TiU*U#^-LkMR!aGYktDm4!Z8PN+BWhADIj(I$tHqsf<(C--K0g3Jn
zh#7aOC9GmctaS%$W+*M}<WzWwoJ~QBQ3`f$_AQmV9<fE6ADHXIU!`o(?ybW{#^s0>
zHA+gd?XtB<&#D+=;oi7$&6DgIS1aVc9uS(h4@K%UgP@Ub{IF6kH}7R|LA%8h_6k|d
zOHEj$aP!N-gtP^8g=uJKMtg^C0;4YRNmr4qV@<8=Qq{v`K~JXcyv3A2!vG3n%#1P7
S&7TDG?e-h5cL@L5MT~_s`-Tqy

literal 0
HcmV?d00001

diff --git a/tests/resources/merge-recursive/.gitted/objects/43/6ea75c99f527e4b42fddb46abedf7726eb719d b/tests/resources/merge-recursive/.gitted/objects/43/6ea75c99f527e4b42fddb46abedf7726eb719d
new file mode 100644
index 0000000000000000000000000000000000000000..e8825d867a2b797bf5a0039671e9419b80c200cf
GIT binary patch
literal 173
zcmV;e08;;W0i}*hY6CG4M6=c@bODEMsr3V6yqRTozCgRx!^~nvW-OEIM+v!sp%zuI
zpeSkEwsz|Ree^@sf@X9vQc{VKW?&?APE_cQ!DFbYfaG~L4?cA7mR%NyQh?dVkRcM@
zJq19_u~g(-3dfYa;a6YUVW;}dN42-5ZO^vbvkv;}uKHK}r%!3y#UfG2CHR!=2?)Rp
bI?i@|bH;qNy3VU`U&n=^>Ez50Hyu$ygu7Sn

literal 0
HcmV?d00001

diff --git a/tests/resources/merge-recursive/.gitted/objects/5a/ba269b3be41fc8db38068d3948c8af543fe609 b/tests/resources/merge-recursive/.gitted/objects/5a/ba269b3be41fc8db38068d3948c8af543fe609
new file mode 100644
index 0000000000000000000000000000000000000000..85bc8f569e855cbf01f67de58f490d51f7e8b5f8
GIT binary patch
literal 208
zcmV;>05AV|0V^p=O;s>5GG{O}FfcPQQAjK<NGwWBFD=$9sVHIizd0|^KK_1J_KJW-
zj85rUT1Ogcp$d~yQ`5j|GQLUZ`?Ox3C(L=Xrp`4n?9Lp9X)rbUrI|T7nP6q!HDLh^
z-FhYU4;$vaj*`8{*U-uZRhC|qSXK#EB-i_Y+OJiM{9C5j>P}<4`%GqoWfxRYer0h<
zY7xZ7_43CZ>Tj;SFV484ZsW<Ak|{@LKvk8cCgy<EEZ>k8T$lY^VAlR8|EF&&z4D;^
KmI45u^<Ef|=43kn

literal 0
HcmV?d00001

diff --git a/tests/resources/merge-recursive/.gitted/objects/73/b20c8e09fa2726d69ff66969186014165da3c3 b/tests/resources/merge-recursive/.gitted/objects/73/b20c8e09fa2726d69ff66969186014165da3c3
new file mode 100644
index 0000000000000000000000000000000000000000..6559958c5653709bf14e747040e7e256334d34ac
GIT binary patch
literal 208
zcmV;>05AV|0V^p=O;s>5GG{O}FfcPQQAjK<NGwWBFD=$9sVHIizd0|^KK_1J_KJW-
zj85rUT1Ogcp$d~yQ`5j|GQLUZ`?Ox3C(L=Xrp`4n?9Lp9X)rbUrI|T7nP6q!HDLh^
z-FhYU4;$vaj*`8{*U-uZRhC|qSXK#E^sy+gs^{}OhWY=$I=%~Xn%((C;xklHer0h<
zY7xZ7_43CZ>Tj;SFV484ZsW<Ak|{@LKvk8cCgy<EEZ>k8T$lY^VAlR8|EF&&z4D;^
KmI443F<*?<6J%rn

literal 0
HcmV?d00001

diff --git a/tests/resources/merge-recursive/.gitted/objects/7e/3056f6765b3044ab09701077dbe1eb5b0e9ad0 b/tests/resources/merge-recursive/.gitted/objects/7e/3056f6765b3044ab09701077dbe1eb5b0e9ad0
new file mode 100644
index 0000000000000000000000000000000000000000..c4b8355186272c1eb916727bae0a16c6ad75a545
GIT binary patch
literal 208
zcmV;>05AV|0V^p=O;s>5GG{O}FfcPQQAjK<NGwWBFD=$9sVHIizd0|^KK_1J_KJW-
zj85rUT1Ogcp$d~yQ`5j|GQLUZ`?Ox3C(L=Xrp`4n?9Lp9X)rbUrI|T7nP6q!HDLh^
z-FhYU4;$vaj*`8{*U-uZRhC|qSXK#EbmOkc?23=G{Pr1#?>gOR@qzp6TSus({L12z
z)FOzD>*bF-)ZbitUz~A8-NutKB~y;hfT}7>P0RtSS-v4HxGwv-z^wgG{!ialdgVd+
KEd>AsJzr5;MP&d0

literal 0
HcmV?d00001

diff --git a/tests/resources/merge-recursive/.gitted/objects/8a/bda8de114a93f2d3c5a975ee2960f31e24be58 b/tests/resources/merge-recursive/.gitted/objects/8a/bda8de114a93f2d3c5a975ee2960f31e24be58
new file mode 100644
index 0000000000000000000000000000000000000000..a03624d8162248d98931d06f6a3f8e82907f58c1
GIT binary patch
literal 169
zcmV;a09OBa0i{km3IZ_{w9YAVftCF80wOkB+IfNO%L|(#8(AY>-zeTdm|{N6FxYA>
zohxe&eJA3ik_4M0D4#4yZIGf8OCXst1PxlFvrZ7Z$DOv$J^CesrQjjUQAJ^$%U-CY
zaPi)`B_Je|S$y`j?R-wJxF>#FTYa>RpJ=!rcA;<ZQ%7v|%%w3Ff|btkNf;s6aL3tB
Xf6lOLOC=YKy^IS3^Q74uTZB@;y3tN*

literal 0
HcmV?d00001

diff --git a/tests/resources/merge-recursive/.gitted/objects/96/23368f0fc562d6d840372ae17dc4cc32d51a80 b/tests/resources/merge-recursive/.gitted/objects/96/23368f0fc562d6d840372ae17dc4cc32d51a80
new file mode 100644
index 0000000000000000000000000000000000000000..70bf8fbb09f71502f9662c0c1152345d24f42a4d
GIT binary patch
literal 172
zcmV;d08{^X0i}*h3IZ_@L|x|;xxh$1ozH-Xn_0T^0!gRCWHA$o5wC9)Zy?m7>J=1)
zb=ykk%D|yFBA!BY(P-^;keLvy)rzbLGI?-Fkmo=WvSRnpXz$#ii`g5RozF5!kHT1+
zolr?(bk5p1qfd}oc=ok6zNA-ZiQm?`J?hR+H0Z}&=v(~K5$ks562SP`NCSKlAOst9
aobB}I47=7;a>3BcxG=O#ioF5MBU3vdf>!DP

literal 0
HcmV?d00001

diff --git a/tests/resources/merge-recursive/.gitted/objects/9a/e63b4a8ce0f181b2d1d098971733a103226917 b/tests/resources/merge-recursive/.gitted/objects/9a/e63b4a8ce0f181b2d1d098971733a103226917
new file mode 100644
index 0000000000000000000000000000000000000000..0cbd00d539ac5fd660de5c73b1558663e690bc6f
GIT binary patch
literal 240
zcmV<M01y9o0i}>VPQ*YAg{gCj>9$&Adwya|2+?dw#|1oN4@;2*WrMgr0Tws_-Fx5r
z<ic&4rk5>5=9_JG4{E}-YbvAk3Q$=HMg>KzTx%E9=*e7$S6zMHLNytMp%EDpWsqhj
znEQ^IEtkd?)d_xlDHLPj4!z|<R*VzGk<@XtmRgHs8I^y1)@sV;h)E@Ove>f9nB7SV
z^oUNWdgejjw)3)vlfCO|;px0gmt_ujzSGb2;9tYF-L_@A513MB$;dGrAps0K-Jh}f
qKhF%0zCL@XtIqB0mvHz_rz0JL&i2>iA-v4nay3s!96kWmDSDv#$acp7

literal 0
HcmV?d00001

diff --git a/tests/resources/merge-recursive/.gitted/objects/9b/258ad4c39f40c24f66bf1faf48eb6202d59c85 b/tests/resources/merge-recursive/.gitted/objects/9b/258ad4c39f40c24f66bf1faf48eb6202d59c85
new file mode 100644
index 0000000000000000000000000000000000000000..305e1f3e92c78d686d7e067ced299cfdb8a3b3ee
GIT binary patch
literal 240
zcmV<M01y9o0i}?=PQ*YAgsJls+od|>_5Q>b2+>?g#|wDZUhaxyQ3&Go2|q`D5}p0c
zc%*Ud^L*Z1On9@cW=@o;G>LiQRsaey!XzNx7b>N(mtawihgVr`*&InxAvN!#aA>HZ
zCgCZWA!lg88^&UZF8-oCF+oLCkC=d~D*M!SOr$AS(jbO#@pHxyGBs#5Wz?(`AxtRd
zC#|v8fSSAz4D!C6`s$AQA*;IQQ=i}Z;_hvyU(=&~3%}cK?el~4F(%@KF}njqfMKWm
qGdBBY%<yFEi@BdPH(pzLy!$)3w)N=F%hp|4WvQp*Aq<~4$BL<0@O&o#

literal 0
HcmV?d00001

diff --git a/tests/resources/merge-recursive/.gitted/objects/9e/12bce04446d097ae1782967a5888c2e2a0d35b b/tests/resources/merge-recursive/.gitted/objects/9e/12bce04446d097ae1782967a5888c2e2a0d35b
new file mode 100644
index 0000000000000000000000000000000000000000..0940d09c2f01a50c1b8fe3dc047af333261b955d
GIT binary patch
literal 268
zcmV+n0rUQN0VPl|Zo@DP?5tN@_arFLsp!-xV~YeW(2=%jTYxOOA{8UQFXe2+-SO_o
zE=h;ix0k2$<>TiU*U#^-QwV1^aGYktDm4!Z8PN+BWhADIj(I#DH_{o=(C--K0g3Jn
zh#7aOC9GlxtaS%$W+*M}<WzWwoJ~QBQ3`f$_AQmV9<W85ADHXIU!`o(?ybW{#^rz(
zHA+gd?XtB<&#D+=;oi7$&6Dhes}*uz4+zcMhaz>FLD0xIepo4&oA)xfpxxpLdxb3K
zr6w#=xcTK^LfQhl!ZfrqqrJm6fl-(EsH;fUv8L8_sp?^}peIvz-eO9iVE~0OX2zK4
S=1+q8cKeOjdk+8Yk&Keol8Ar+

literal 0
HcmV?d00001

diff --git a/tests/resources/merge-recursive/.gitted/objects/a2/8c21c90aa36580641b345011869d1a899a6783 b/tests/resources/merge-recursive/.gitted/objects/a2/8c21c90aa36580641b345011869d1a899a6783
new file mode 100644
index 0000000000000000000000000000000000000000..91ffb4b88e6e674b9ac108f9833d90c2b6fa0d9c
GIT binary patch
literal 239
zcmV<L01*Fp0i}?=PQ*YAgsJls+od|>_5Q>b2+>?g#|wDZUhaxyQ3&Go34d3gL}!09
z9%)?rJfAlg6W(mAnG<CyO=6z76@WsFFbRnFg-U7cC0JDB;Z;^!Hpdx5$kd?Klu@%%
zgfO9)pR~qW18VX@@aHee6BATK^@s_$s<KaQ$3&WPB@JSD@sku4Qu96vhlUzz5}uM7
za)uVXVJwztkoWD>S9jD8S=BwC`ux@xcW*oWnjY<2_}y-6pC6o$F%c(3?+y?FhMn%u
p*zBJ%!;`Hq=6=%Lcx~nJ?s9T%>(QN;t-G?yQcuSN4xbL0i(#MRb<_X=

literal 0
HcmV?d00001

diff --git a/tests/resources/merge-recursive/.gitted/objects/ad/98bfa4679fb00b89207a0a11b8bbf91a3e4de9 b/tests/resources/merge-recursive/.gitted/objects/ad/98bfa4679fb00b89207a0a11b8bbf91a3e4de9
new file mode 100644
index 0000000000000000000000000000000000000000..457f9da1f1bc3fc5daa3c7f492f9fb2685f6700c
GIT binary patch
literal 208
zcmV;>05AV|0V^p=O;s>5GG{O}FfcPQQAjK<NGwWBFD=$9sVHIizd0|^KK_1J_KJW-
zj85rUT1Ogcp$d~yQ`5j|GQLUZ`?Ox3C(L=Xrp`4n?9Lp9X)rbUrI|T7nP6q!HDLh^
z-FhYU4;$vaj*`8{*U-uZRhC|qSXK#EbmKwPgw2OkcncTts4|^2zq$RAdO1{4er0h<
zY7xZ7_43CZ>Tj;SFV484ZsW<Ak|{@LKvk8cCgy<EEZ>k8T$lY^VAlR8|EF&&z4D;^
KmI44|zFlT3oMPwz

literal 0
HcmV?d00001

diff --git a/tests/resources/merge-recursive/.gitted/objects/bd/97980c22d122509cdd915fd9788d56c8d3ae20 b/tests/resources/merge-recursive/.gitted/objects/bd/97980c22d122509cdd915fd9788d56c8d3ae20
new file mode 100644
index 0000000000000000000000000000000000000000..71295e07145cb9dbc13de764cd77335bdc1c0983
GIT binary patch
literal 163
zcmV;U09^lg0i{pL4FVw)^-L8sFy_O+2NGjU%yeJ_ET4=A27?&e7ncsay(M`|tfgE#
zm&)#XBjRQb5~3w=*-Ilaq01T3p%WHCD1kcpInM0n8*QDNXhOD{oUvIXVIye7Y(OR%
zgE5G~MVnM+{?XUk_>!K!C4O0Jxz~*!XsB;=qL1-o`&i473#GJm8l2=4C;&FpF}Bm6
RG3@+3J^GhPuov*HPsMvROWptg

literal 0
HcmV?d00001

diff --git a/tests/resources/merge-recursive/.gitted/objects/ca/224bba0a8a24f1768804fe5f565b1014af7ef2 b/tests/resources/merge-recursive/.gitted/objects/ca/224bba0a8a24f1768804fe5f565b1014af7ef2
new file mode 100644
index 0000000000000000000000000000000000000000..0dd861f2c43e7f10a1ccbaf4ad794e9b7bac5091
GIT binary patch
literal 170
zcmV;b09F5Z0i}*j3c@fHgk9$pxj^N;{5Bxsrb~BT;3avbU9^!H@%l#b2Er_6zJXy<
z*|xPwWzC^gX6adjb+hx%Mh(VLgx~?e`y3fL+6WvdgSb=Wy~#lAbTl+3h8ahUDr1H)
z29I8ALeNUNfL_qEEv3pSzo=$;Tgvt*yF78HA9vwz@k_^4wzEWI>=>-JP7YuIM5q01
Y<3DG_wd8eP6ScKp=$Zx;Z>2v`!Lnvk6951J

literal 0
HcmV?d00001

diff --git a/tests/resources/merge-recursive/.gitted/objects/d2/682aaf9594080ce877b5eeee110850fd6e3480 b/tests/resources/merge-recursive/.gitted/objects/d2/682aaf9594080ce877b5eeee110850fd6e3480
new file mode 100644
index 0000000000000000000000000000000000000000..c79a3bb0f929cebff178786097b6685093bcaaa6
GIT binary patch
literal 272
zcmV+r0q_2J0VPnoZo@zf>wI6q?nzLfQ_(3?(50^=1v1LE93OB#87DbL{=PbA6G)1r
z)Ff%}`u6g4_}%|qaQr%dKZkH&1IO!Nm}JhKLVC19MHz`Hqhap1+l6#MG_)&5xkI9R
z1!Bfs<`O2c4W@YoY+xvj?Bum@7de}P6ulIz+~8X(^R&SdZFpd=4?pMq=jr2gsT~$F
zE*sRSUQ&`}l}$xjRz(*Jx5kyLo@6^5t&sbAK&ak66q&CB2paju4=d$z^IirQ)LT4Z
zt&qjM)D@!?u6{X~kk){vFm?6JXz#E^VALeu>Lil2pHuBR&gx+@q9s#zUSdk1t^<WW
WW=5ar=1+q8cKwal+l7Dd(2J6D<c324

literal 0
HcmV?d00001

diff --git a/tests/resources/merge-recursive/.gitted/objects/d8/dd349b78f19a4ebe3357bacb8138f00bf5ed41 b/tests/resources/merge-recursive/.gitted/objects/d8/dd349b78f19a4ebe3357bacb8138f00bf5ed41
new file mode 100644
index 0000000000000000000000000000000000000000..ade33f7f53e9bd39a5524365738839c491250d66
GIT binary patch
literal 277
zcmV+w0qXvE0VR;JZo@DPL_6y%E_+fG=u~vdP_$XnHgO7Mq;1+3Ad7}b$H?DTa@ITY
z?vZtn8n16JPoJm#-xcTY%g@HSPd2dc2g4+DY!%X>5lYGkOc6D6x7#hG1H7SGHHs|)
z-HYHO?lLDgiES~>t6&2|Y2<A7iCfRn6r|`RVfBW*r7}-jEZ&BPmgn8?Wq+&=)wM7z
zWSq7rRh@(&%Q`kCX;>AlPuv(6uVj)v<6NEgha;-54_C6Ynq=+=5Y+RHA5qHbmbnah
zpxlxhR)i>)p?Zvxxa37=LRt#y#MG8Ey}iR0fl(cJr;|w3ZVrWYoHduph=xpa^5R1P
bwJpeXJ~FyMxBMhn-Y&n%cpLW*MV5+%UnhpR

literal 0
HcmV?d00001

diff --git a/tests/resources/merge-recursive/.gitted/objects/d8/e05a90b3c2240d71a20c2502c937d9b7d22777 b/tests/resources/merge-recursive/.gitted/objects/d8/e05a90b3c2240d71a20c2502c937d9b7d22777
new file mode 100644
index 0000000000000000000000000000000000000000..b157ba17c290d5451ce52c7be2dc01fa691a2806
GIT binary patch
literal 272
zcmV+r0q_2J0VPnoZo@zf>wI6q>`76eQ_(3?(50^=1v1LE93OB#87DbL{=PbA6G)1r
z)Ff%}`u6g4_}%|qaQr%dZ$db*f#Y>BOfu(AAw625qKw3p(J=SB-9kDb8rl`3+#%7u
z0x{z*a|x5!7Sp@}HZYV%cJf-di=0hCie3s<ZtyLYdD>!$HasxbhoAHQ^Yn4L)D8<7
zmn~{kFDc2g%BCVMtD=jATjR=APqJqmt&sbAK&ak66q&CB2paju4=d$z^IirQ)LT4Z
zt&qjM)D@!?u6{X~kk){vFm?6JXz#E^VALeu=_Hc1pHuBR&gx+@q9s#zUSdk1t^<WW
WW=5ar=1+q8cKwal+k}7cwu^--sE4}%

literal 0
HcmV?d00001

diff --git a/tests/resources/merge-recursive/.gitted/objects/da/b7b53383a1fec46632e60a1d847ce4f9ae14f2 b/tests/resources/merge-recursive/.gitted/objects/da/b7b53383a1fec46632e60a1d847ce4f9ae14f2
new file mode 100644
index 0000000000000000000000000000000000000000..cc4f2436978fb00dbe6924319fbfc1ace3025a15
GIT binary patch
literal 208
zcmV;>05AV|0V^p=O;s>5GG{O}FfcPQQAjK<NGwWBFD=$9sVHIizd0|^KK_1J_KJW-
zj85rUT1Ogcp$d~yQ`5j|GQLUZ`?Ox3C(L=Xrp`4n?9Lp9X)rbUrI|T7nP6q!HDLh^
z-FhYU4;$vaj*`8{*U-uZRhC|qSXK#E#CBWM#;j@nv9Jd*_oJ-8OW4~8tb!`auPiP}
zErQs%UjDd4{mr%a#Ti%BZ9ExMGUezDsH(Em#2m1i<r~t1>$0B<%-a9t|MYF8S00q#
KQUCxBQe1Jq@?@z1

literal 0
HcmV?d00001

diff --git a/tests/resources/merge-recursive/.gitted/objects/e2/d185fa827d58134cea20b9e1df893833c6560e b/tests/resources/merge-recursive/.gitted/objects/e2/d185fa827d58134cea20b9e1df893833c6560e
new file mode 100644
index 0000000000000000000000000000000000000000..fc80c08515319eca869719cabe8f50ddee61f8f9
GIT binary patch
literal 208
zcmV;>05AV|0V^p=O;s>5GG{O}FfcPQQAjK<NGwWBFD=$9sVHIizd0|^KK_1J_KJW-
zj85rUT1Ogcp$d~yQ`5j|GQLUZ`?Ox3C(L=Xrp`4n?9Lp9X)rbUrI|T7nP6q!HDLh^
z-FhYU4;$vaj*`8{*U-uZRhC|qSXK#EG*4*H0~fao)7ObNO{<FNIP_@2<!Gp){L12z
z)FOzD>*bF-)ZbitUz~A8-NutKB~y;hfT}7>P0RtSS-v4HxGwv-z^wgG{!ialdgVd+
KEd>C}tX{rBZ(}Y1

literal 0
HcmV?d00001

diff --git a/tests/resources/merge-recursive/.gitted/objects/e5/0fbbd701458757bdfe9815f58ed717c588d1b5 b/tests/resources/merge-recursive/.gitted/objects/e5/0fbbd701458757bdfe9815f58ed717c588d1b5
new file mode 100644
index 0000000000000000000000000000000000000000..96467c1066d719f545dd1762c1fdd254e3262d27
GIT binary patch
literal 268
zcmV+n0rUQN0VPl|Zp1JQ>+Dys``w{Hr=nA*qDz58uR}*AQ4#}=6<BhD`+eoyCXf_K
zsY}w~_3h<pDzx39QrAlepKRbb&4yKK9uzX77b?m~Oc@>Xcs}o>GoqnCFv<fG-5U@y
z?ovxw#ZFl30ocq?TG+{{@DMqhf)t|^9Ng?%E&hZ(+Wf#=AFjV2-?y*ZU+b`waXFzy
zjgpe=hiom<vnqyIxHoQG^CY|A#|pWx2ZZMBLy<boAZX-`A6Cj`^IirQv|BvksF20H
z)PzL}H@_TANLxTxn1*&{w0GDpFzOPYbrs1v*3`N#RXt1=^knMJdrS#544^Q^%or1G
S{v?=hx8HcZ=kO1;;Eb}@wSzDK

literal 0
HcmV?d00001

diff --git a/tests/resources/merge-recursive/.gitted/objects/f1/72517a8cf39e009ffff541ee52429b89e418f3 b/tests/resources/merge-recursive/.gitted/objects/f1/72517a8cf39e009ffff541ee52429b89e418f3
new file mode 100644
index 0000000000000000000000000000000000000000..3d29a0fe8dc4d175132ac0d56fe4fcbeb60dccd9
GIT binary patch
literal 268
zcmV+n0rUQN0VPl|Zo@DP?5tN@_arFLsp!-xV~YeW(2=%jTYxOOA{8UQFXe2+-SO_o
zE=h;ix0k2$<>TiU*U#^-=Mc_p;5f~ORcam-GNKnM%1BHZ9rJiRZlp7!q2Dpe0}|aE
z5Hs#lOIXDYSnCeh%urg`$*J%VIh%qMqZI7i>{}{zJz$GAKQPyaze?Gn-CKu^jLQKn
zYLt{@+huE!o>ei#!o6|hnkU%_S1aVc9uS(h4@K%UgP@Ub{IF6kH}7R|LA%8h_6k|d
zOHEj$aP!N-gtP^8g=uJKMtg^C0;4YRQCE?yV@<8=Qq{v`K~JXcyv3A2!vG3n%#1P7
S&7TDG?e-h5cMAX7UyPDbtcA4z

literal 0
HcmV?d00001

diff --git a/tests/resources/merge-recursive/.gitted/refs/heads/branchE-1 b/tests/resources/merge-recursive/.gitted/refs/heads/branchE-1
new file mode 100644
index 0000000000000000000000000000000000000000..b8d011e2d58d7a0b6fe2f91ba3e44d03ce95df09
GIT binary patch
literal 41
ucmV~$!4Uu;2m`Rc(?Ab|b&5y#AHn1ih#4B22zlLZ3vDWIj++NnE1VDTEDId~

literal 0
HcmV?d00001

diff --git a/tests/resources/merge-recursive/.gitted/refs/heads/branchE-2 b/tests/resources/merge-recursive/.gitted/refs/heads/branchE-2
new file mode 100644
index 0000000000000000000000000000000000000000..5e1e1acd9a317fed388ba990f28596ae35a2b4e4
GIT binary patch
literal 41
ucmV~$!4Uu;2m`Rc+lWYyaln@SM=<ddD%_Vj*C21VA={%`9Kb@2om?OEJqw}$

literal 0
HcmV?d00001

diff --git a/tests/resources/merge-recursive/.gitted/refs/heads/branchE-3 b/tests/resources/merge-recursive/.gitted/refs/heads/branchE-3
new file mode 100644
index 0000000000000000000000000000000000000000..eaec8d81a17e793215bedd3f412c089362f80b6b
GIT binary patch
literal 41
vcmV~$!4Uu;2m`Rc(;yZO#sReZk6@Cm7IiTv2^j_5o0~<%Ygf^0IbrJq@#_mW

literal 0
HcmV?d00001