From 1d04f477e5c3c83b6c3985df21fa5fbec600f302 Mon Sep 17 00:00:00 2001
From: Robert Coup <robert@coup.net.nz>
Date: Tue, 19 Mar 2019 23:43:56 +1300
Subject: merge: tests for bare repo merge analysis dupe of workdir/analysis.c
 against a bare repo.

---
 .../modules/submodule/objects/ae/39c77c70cb6bad18bb471912460c4e1ba0f586 | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 tests/resources/merge-resolve.git/modules/submodule/objects/ae/39c77c70cb6bad18bb471912460c4e1ba0f586

(limited to 'tests/resources/merge-resolve.git/modules/submodule/objects/ae/39c77c70cb6bad18bb471912460c4e1ba0f586')

diff --git a/tests/resources/merge-resolve.git/modules/submodule/objects/ae/39c77c70cb6bad18bb471912460c4e1ba0f586 b/tests/resources/merge-resolve.git/modules/submodule/objects/ae/39c77c70cb6bad18bb471912460c4e1ba0f586
new file mode 100644
index 000000000..6ceffdd4e
--- /dev/null
+++ b/tests/resources/merge-resolve.git/modules/submodule/objects/ae/39c77c70cb6bad18bb471912460c4e1ba0f586
@@ -0,0 +1,2 @@
+x
���
!@=S
hf�%�x��!�� ��]k���/�{k��-�a]
xW�s	=,l�P��
+��#g0K��IC�����,5��1�� �9;a�lB��=�>��|h}_{{�M�e�?�����u����6�����"���>:叄ʃ6^���Kd
\ No newline at end of file
-- 
cgit v1.2.1