diff options
author | Joey Hess <joey@kitenet.net> | 2014-02-03 12:23:05 -0400 |
---|---|---|
committer | Joey Hess <joey@kitenet.net> | 2014-02-03 12:23:05 -0400 |
commit | b02e638bf48470495279cfb52ec8d035a5e6b60e (patch) | |
tree | 425a97e8712cc1adb6c711f53fc9f782699a55cf /Test.hs | |
parent | f5d0c8f0bf7f018479eb4da7e8c41598b7aacb7d (diff) |
improve failure message
Diffstat (limited to 'Test.hs')
-rw-r--r-- | Test.hs | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -837,9 +837,9 @@ test_mixed_conflict_resolution env = do variantprefix = conflictor ++ ".variant" checkmerge d = do doesDirectoryExist (d </> conflictor) @? (d ++ " conflictor directory missing") - (any (variantprefix `isPrefixOf`) - <$> getDirectoryContents d) - @? (d ++ "conflictor file missing") + l <- getDirectoryContents d + any (variantprefix `isPrefixOf`) l + @? (d ++ " conflictor file missing in: " ++ show l ) {- Set up repos as remotes of each other. -} pair :: TestEnv -> FilePath -> FilePath -> Assertion |