From 7b27b6cf716429080fbc968d8f573977996ee112 Mon Sep 17 00:00:00 2001
From: Robert Coup <robert@coup.net.nz>
Date: Thu, 6 Jun 2019 16:32:09 +0100
Subject: Refactor testing:

- move duplication between merge/trees/ and merge/workdir/ into merge/analysis{.c,.h}
- remove merge-resolve.git resource, open the existing merge-resolve as a bare repo instead.
---
 .../merge-resolve.git/objects/ad/a55a45d14527dc3dfc714ea1c65d2e1e6fbe87  | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 tests/resources/merge-resolve.git/objects/ad/a55a45d14527dc3dfc714ea1c65d2e1e6fbe87

(limited to 'tests/resources/merge-resolve.git/objects/ad/a55a45d14527dc3dfc714ea1c65d2e1e6fbe87')

diff --git a/tests/resources/merge-resolve.git/objects/ad/a55a45d14527dc3dfc714ea1c65d2e1e6fbe87 b/tests/resources/merge-resolve.git/objects/ad/a55a45d14527dc3dfc714ea1c65d2e1e6fbe87
deleted file mode 100644
index 3091b8f3d..000000000
--- a/tests/resources/merge-resolve.git/objects/ad/a55a45d14527dc3dfc714ea1c65d2e1e6fbe87
+++ /dev/null
@@ -1 +0,0 @@
-x
+)JMU067d040031QH,-��M-JOML�I�+�(aH:,�:�C����:��	�o>ZC'g$楧��f��&%�%g�5��qY��e�Zo���k�M��2���Ԑ�X\�ZDPC~^ZNfrIf^:X���ZHي�1O(_�,'��
jvn~JfZ&�5��`��nלU7�V.6�t6��L/�R�����2���I{�|���	2m�g�˾��
��1�����5ӿ�,\��})TC)0<��vʉ�z֛�9���M���Յ'6�b
�N�*
\ No newline at end of file
-- 
cgit v1.2.1