revert parentDir change

Reverts 2bba5bc22d049272d3328bfa6c452d3e2e50e86c

Unfortunately, this caused breakage on Windows, and possibly elsewhere,
because parentDir and takeDirectory do not behave the same when there is a
trailing directory separator.

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"