From 1782038144ef3413831801bb9c2f3038a84ac6f4 Mon Sep 17 00:00:00 2001 From: Ben Straub Date: Thu, 14 Nov 2013 14:05:52 -0800 Subject: Rename tests-clar to tests --- .../objects/26/153a3ff3649b6c2bb652d3f06878c6e0a172f9 | Bin 0 -> 48 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 tests/resources/merge-resolve/.gitted/objects/26/153a3ff3649b6c2bb652d3f06878c6e0a172f9 (limited to 'tests/resources/merge-resolve/.gitted/objects/26/153a3ff3649b6c2bb652d3f06878c6e0a172f9') diff --git a/tests/resources/merge-resolve/.gitted/objects/26/153a3ff3649b6c2bb652d3f06878c6e0a172f9 b/tests/resources/merge-resolve/.gitted/objects/26/153a3ff3649b6c2bb652d3f06878c6e0a172f9 new file mode 100644 index 000000000..4fcaa07e2 Binary files /dev/null and b/tests/resources/merge-resolve/.gitted/objects/26/153a3ff3649b6c2bb652d3f06878c6e0a172f9 differ -- cgit v1.2.1