merge: add a third-level recursive merge

12 files changed, 12 insertions, 0 deletions

diff --git a/tests/resources/merge-recursive/.gitted/objects/00/7f1ee2af8e5d99906867c4237510e1790a89b8 b/tests/resources/merge-recursive/.gitted/objects/00/7f1ee2af8e5d99906867c4237510e1790a89b8
new file mode 100644
index 000000000..d9399d71c
--- /dev/null
+++ b/tests/resources/merge-recursive/.gitted/objects/00/7f1ee2af8e5d99906867c4237510e1790a89b8
@@ -0,0 +1,3 @@
+x
�NI
+1�<��F�tg
A<z�Y:L����F�Bj���j-�I�]߈fa��h
+R)�<�+΅sZd�8��Fkg$R�Qqe!��&Zg�R���g_��.���nK����
��N�
~j[=2
�ց2��8��;�v�sf��Tr���qa�<��
`bQ�
\ No newline at end of file
diff --git a/tests/resources/merge-recursive/.gitted/objects/15/faa0c9991f2d65686e844651faa2ff9827887b b/tests/resources/merge-recursive/.gitted/objects/15/faa0c9991f2d65686e844651faa2ff9827887b
new file mode 100644
index 000000000..54cd6f26e
--- /dev/null
+++ b/tests/resources/merge-recursive/.gitted/objects/15/faa0c9991f2d65686e844651faa2ff9827887b
diff --git a/tests/resources/merge-recursive/.gitted/objects/4d/fc1be85a9d6c9898152444d32b238b4aecf8cc b/tests/resources/merge-recursive/.gitted/objects/4d/fc1be85a9d6c9898152444d32b238b4aecf8cc
new file mode 100644
index 000000000..9db684d40
--- /dev/null
+++ b/tests/resources/merge-recursive/.gitted/objects/4d/fc1be85a9d6c9898152444d32b238b4aecf8cc
diff --git a/tests/resources/merge-recursive/.gitted/objects/50/e4facaafb746cfed89287206274193c1417288 b/tests/resources/merge-recursive/.gitted/objects/50/e4facaafb746cfed89287206274193c1417288
new file mode 100644
index 000000000..b1eaee557
--- /dev/null
+++ b/tests/resources/merge-recursive/.gitted/objects/50/e4facaafb746cfed89287206274193c1417288
@@ -0,0 +1,2 @@
+x
+)JMU022g040031QH,.H,JL/-�+�(a��9/�>�~W���E�N�YZGj�
+�RS��j2�I���^�'�y���51���i05���99�`e�5a
�z%�潎������U�^�XV	Vt�ٙ�o���]2�Y~��P�1�(���$�b�z���7��g\Q��dLɔ�3���Rs�jD-89S^75#��-�ע�3�;�
�\�
\ No newline at end of file
diff --git a/tests/resources/merge-recursive/.gitted/objects/5e/8747f5200fac0f945a07daf6163ca9cb1a8da9 b/tests/resources/merge-recursive/.gitted/objects/5e/8747f5200fac0f945a07daf6163ca9cb1a8da9
new file mode 100644
index 000000000..fa1c9e5dc
--- /dev/null
+++ b/tests/resources/merge-recursive/.gitted/objects/5e/8747f5200fac0f945a07daf6163ca9cb1a8da9
diff --git a/tests/resources/merge-recursive/.gitted/objects/5f/18576d464946eb2338daeb8b4030019961f505 b/tests/resources/merge-recursive/.gitted/objects/5f/18576d464946eb2338daeb8b4030019961f505
new file mode 100644
index 000000000..d03742b92
--- /dev/null
+++ b/tests/resources/merge-recursive/.gitted/objects/5f/18576d464946eb2338daeb8b4030019961f505
diff --git a/tests/resources/merge-recursive/.gitted/objects/ad/1ea02c2cc4f55c1dff87b80a086206a73885eb b/tests/resources/merge-recursive/.gitted/objects/ad/1ea02c2cc4f55c1dff87b80a086206a73885eb
new file mode 100644
index 000000000..99207a9dd
--- /dev/null
+++ b/tests/resources/merge-recursive/.gitted/objects/ad/1ea02c2cc4f55c1dff87b80a086206a73885eb
@@ -0,0 +1,2 @@
+x
+)JMU022g040031QH,.H,JL/-�+�(a��9/�>�~W���E�N�YZGj�
+�RS��j2�I���^�'�y���51���i05���99�`e�5a
�z%�潎������U�^�XV	Vt�ٙ�o���]2�Y~��P�1�(���$�b�z���7��g\Q��dLɔ�3���Rs�j��ݿ*���~뛘���R�+
�<[{
\ No newline at end of file
diff --git a/tests/resources/merge-recursive/.gitted/objects/ca/49d1a8b6116ffeba22667bba265fa5261df7ab b/tests/resources/merge-recursive/.gitted/objects/ca/49d1a8b6116ffeba22667bba265fa5261df7ab
new file mode 100644
index 000000000..1ea596763
--- /dev/null
+++ b/tests/resources/merge-recursive/.gitted/objects/ca/49d1a8b6116ffeba22667bba265fa5261df7ab
@@ -0,0 +1,2 @@
+x
���N1D��+���8q^BH����:{�ݠ��^=��g�Fھ_8�FWo�*s]#�ZR�)Zl$�N�0ڔ��z�bY4+���
+��VC�E���9����>�_=�$#)�h�Df#���fN-őY�ml��Cy�^�ik�k;�F'�Tw�e�l���[@"�2Y�p6d�2�,7��1ˣ�g��48���	.�h�v>d�?��
;No�
\ No newline at end of file
diff --git a/tests/resources/merge-recursive/.gitted/objects/e1/dcfc3038be54195a59817c89782b261e46cb05 b/tests/resources/merge-recursive/.gitted/objects/e1/dcfc3038be54195a59817c89782b261e46cb05
new file mode 100644
index 000000000..3668b546a
--- /dev/null
+++ b/tests/resources/merge-recursive/.gitted/objects/e1/dcfc3038be54195a59817c89782b261e46cb05
@@ -0,0 +1 @@
+x
���N1����:��O:��%/�u��ݠ\�O��GT�G�5ܶ�2�yw7�x-X���1p���M��`#��ؠ�6%�F]�
��œᤙ"���H�y�I�)�8Կy*�X�_CX\1��VB�����9�JA��X[���A���ڶk��$��Rg�>ܶ{n�D�2Z��Qk5�Yn��0hn�,�U����V8�e
�N;��G�>
>MpM
\ No newline at end of file
diff --git a/tests/resources/merge-recursive/.gitted/objects/f1/b44c04989a3a1c14b036cfadfa328d53a7bc5e b/tests/resources/merge-recursive/.gitted/objects/f1/b44c04989a3a1c14b036cfadfa328d53a7bc5e
new file mode 100644
index 000000000..7cbaaeecf
--- /dev/null
+++ b/tests/resources/merge-recursive/.gitted/objects/f1/b44c04989a3a1c14b036cfadfa328d53a7bc5e
diff --git a/tests/resources/merge-recursive/.gitted/refs/heads/branchD-1 b/tests/resources/merge-recursive/.gitted/refs/heads/branchD-1
new file mode 100644
index 000000000..fa96ccb28
--- /dev/null
+++ b/tests/resources/merge-recursive/.gitted/refs/heads/branchD-1
@@ -0,0 +1 @@
+4dfc1be85a9d6c9898152444d32b238b4aecf8cc
diff --git a/tests/resources/merge-recursive/.gitted/refs/heads/branchD-2 b/tests/resources/merge-recursive/.gitted/refs/heads/branchD-2
new file mode 100644
index 000000000..8a87f9868
--- /dev/null
+++ b/tests/resources/merge-recursive/.gitted/refs/heads/branchD-2
@@ -0,0 +1 @@
+007f1ee2af8e5d99906867c4237510e1790a89b8