summaryrefslogtreecommitdiff
path: root/Test.hs
diff options
context:
space:
mode:
Diffstat (limited to 'Test.hs')
-rw-r--r--Test.hs2
1 files changed, 1 insertions, 1 deletions
diff --git a/Test.hs b/Test.hs
index 2905c5ce2..dd12997ff 100644
--- a/Test.hs
+++ b/Test.hs
@@ -1071,7 +1071,7 @@ test_uncommitted_conflict_resolution = do
withtmpclonerepo False $ \r2 -> do
indir r1 $ do
disconnectOrigin
- createDirectoryIfMissing True (takeDirectory remoteconflictor)
+ createDirectoryIfMissing True (parentDir remoteconflictor)
writeFile remoteconflictor annexedcontent
git_annex "add" [conflictor] @? "add remoteconflicter failed"
git_annex "sync" [] @? "sync failed in r1"