3 files changed, 5 insertions, 0 deletions

diff --git a/tests/resources/merge-resolve.git/objects/7c/04ca611203ed320c5f495b9813054dd23be3be b/tests/resources/merge-resolve.git/objects/7c/04ca611203ed320c5f495b9813054dd23be3be
new file mode 100644
index 000000000..e3ba6056d
--- /dev/null
+++ b/tests/resources/merge-resolve.git/objects/7c/04ca611203ed320c5f495b9813054dd23be3be
@@ -0,0 +1,2 @@
+x
��Q� D��{

-,tc��^`�%��b(��K��|ͼd&k)�����D�s�l��<f��4a��1B��8�zs��Cv�Ř��E�Q�d���O>�E񧯵�#}�%x���u��z�{y�V���%�r�ɐ�dž�p֨�t��DŽ
+�����UrL
\ No newline at end of file
diff --git a/tests/resources/merge-resolve.git/objects/7c/2c5228c9e90170d4a35e6558e47163daf092e5 b/tests/resources/merge-resolve.git/objects/7c/2c5228c9e90170d4a35e6558e47163daf092e5
new file mode 100644
index 000000000..52fde92a1
--- /dev/null
+++ b/tests/resources/merge-resolve.git/objects/7c/2c5228c9e90170d4a35e6558e47163daf092e5
diff --git a/tests/resources/merge-resolve.git/objects/7c/b63eed597130ba4abb87b3e544b85021905520 b/tests/resources/merge-resolve.git/objects/7c/b63eed597130ba4abb87b3e544b85021905520
new file mode 100644
index 000000000..769f29c6e
--- /dev/null
+++ b/tests/resources/merge-resolve.git/objects/7c/b63eed597130ba4abb87b3e544b85021905520
@@ -0,0 +1,3 @@
+x
��K
+1D]�����t'"n��H:��L$F���xwU�AQܖ�6��f7��I��T*z�J
+�1#;@r�X]�Ꞻ�C3A�� F'�a�j#���T��f a��cn]_�+���s[m�G��'��+~��m9i�� ��P�

�F��C��Q���g�e"N�
\ No newline at end of file