From 4f5e61471afa7ad8e4ea63f8abef704a53ce1cce Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 13 Jun 2016 12:38:11 -0400 Subject: reproduced --- Test.hs | 1 + 1 file changed, 1 insertion(+) (limited to 'Test.hs') diff --git a/Test.hs b/Test.hs index e432f5443..93f63dd9a 100644 --- a/Test.hs +++ b/Test.hs @@ -1390,6 +1390,7 @@ test_mixed_lock_conflict_resolution = let v = filter (variantprefix `isPrefixOf`) l length v == 0 @? (what ++ " not exactly 0 variant files in: " ++ show l) + void $ boolSystem "sh" [Param "-l"] conflictor `elem` l @? ("conflictor not present after conflict resolution") git_annex "get" [conflictor] @? "get failed" git_annex_expectoutput "find" [conflictor] [conflictor] -- cgit v1.2.3