tests for checkout index with conflicts

3acf44d6 · Edward Thomson · 2c2b0ebb · 3acf44d6 · 3acf44d6 · 3acf44d6
Commit 3acf44d6 authored Jul 17, 2013 by Edward Thomson
4 changed files
--- a/tests-clar/checkout/conflict.c
+++ b/tests-clar/checkout/conflict.c
--- a/tests-clar/resources/merge-resolve/.gitted/objects/1a/010b1c0f081b2e8901d55307a15c29ff30af0e
+++ b/tests-clar/resources/merge-resolve/.gitted/objects/1a/010b1c0f081b2e8901d55307a15c29ff30af0e
--- a/tests-clar/resources/merge-resolve/.gitted/objects/72/ea499e108df5ff0a4a913e7655bbeeb1fb69f2
+++ b/tests-clar/resources/merge-resolve/.gitted/objects/72/ea499e108df5ff0a4a913e7655bbeeb1fb69f2
--- a/tests-clar/resources/merge-resolve/.gitted/objects/8b/fb012a6d809e499bd8d3e194a3929bc8995b93
+++ b/tests-clar/resources/merge-resolve/.gitted/objects/8b/fb012a6d809e499bd8d3e194a3929bc8995b93