diff options
Diffstat (limited to 'Test.hs')
-rw-r--r-- | Test.hs | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -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] |