From 1d04f477e5c3c83b6c3985df21fa5fbec600f302 Mon Sep 17 00:00:00 2001 From: Robert Coup 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. --- .../objects/e1/7ace1492648c9dc5701bad5c47af9d1b60c4e9 | Bin 0 -> 264 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 tests/resources/merge-resolve.git/objects/e1/7ace1492648c9dc5701bad5c47af9d1b60c4e9 (limited to 'tests/resources/merge-resolve.git/objects/e1/7ace1492648c9dc5701bad5c47af9d1b60c4e9') diff --git a/tests/resources/merge-resolve.git/objects/e1/7ace1492648c9dc5701bad5c47af9d1b60c4e9 b/tests/resources/merge-resolve.git/objects/e1/7ace1492648c9dc5701bad5c47af9d1b60c4e9 new file mode 100644 index 000000000..4a812e5df Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/e1/7ace1492648c9dc5701bad5c47af9d1b60c4e9 differ -- cgit v1.2.1