From 27fb2b6126acbbe1a1c63a86c94751de5b17d3c3 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 15 Nov 2013 15:42:31 -0400
Subject: [PATCH] add test case for b0f85b3e22cbb608d14f606f57badba79eece945

---
 Test.hs | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/Test.hs b/Test.hs
index 8934e8c473..6f26fa9107 100644
--- a/Test.hs
+++ b/Test.hs
@@ -803,8 +803,16 @@ test_mixed_conflict_resolution env = do
 			let r = if inr1 then r1 else r2
 			indir env r $ do
 				git_annex env "sync" [] @? "sync failed in mixed conflict"
+			checkmerge r1
+			checkmerge r2
 	  where
 		conflictor = "conflictor"
+		variantprefix = conflictor ++ ".variant"
+		checkmerge d = do
+			doesDirectoryExist (d </> conflictor) @? (d ++ " conflictor directory missing")
+			(any (variantprefix `isPrefixOf`) 
+				<$> getDirectoryContents d)
+				@? (d ++ "conflictor file missing")
 
 {- Set up repos as remotes of each other;
  - remove origin since we're going to sync