diff options
author | Joey Hess <joeyh@joeyh.name> | 2016-06-13 12:38:11 -0400 |
---|---|---|
committer | Joey Hess <joeyh@joeyh.name> | 2016-06-13 12:38:11 -0400 |
commit | 4f5e61471afa7ad8e4ea63f8abef704a53ce1cce (patch) | |
tree | 726db5e11472fb320406a1905b0d476528dccf79 /Test.hs | |
parent | 58065d89e898677da35acf6183877f774b43d7a0 (diff) |
reproduced
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] |