summaryrefslogtreecommitdiff
path: root/Test.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2014-10-09 14:53:13 -0400
committerGravatar Joey Hess <joey@kitenet.net>2014-10-09 15:09:11 -0400
commita26b7127d4cc8b2a5e15ef662ab2793dbf9e7919 (patch)
tree95fb3ff9231bffe68f99b02d872ee308b40d0bc8 /Test.hs
parentbe9989b76db21772118f8893ea00d22b6365d301 (diff)
fix some mixed space+tab indentation
This fixes all instances of " \t" in the code base. Most common case seems to be after a "where" line; probably vim copied the two space layout of that line. Done as a background task while listening to episode 2 of the Type Theory podcast.
Diffstat (limited to 'Test.hs')
-rw-r--r--Test.hs6
1 files changed, 3 insertions, 3 deletions
diff --git a/Test.hs b/Test.hs
index 6348b0d6d..50d2f1d55 100644
--- a/Test.hs
+++ b/Test.hs
@@ -122,7 +122,7 @@ main ps = do
#else
handleParseResult $ execParserPure pprefs pinfo args
#endif
- progdesc = "git-annex test"
+ progdesc = "git-annex test"
ingredients :: [Ingredient]
ingredients =
@@ -822,7 +822,7 @@ test_conflict_resolution_movein_regression testenv = withtmpclonerepo testenv Fa
- be missing the content of the file that had
- been put in it. -}
forM_ [r1, r2] $ \r -> indir testenv r $ do
- git_annex testenv "get" [] @? "unable to get all files after merge conflict resolution in " ++ rname r
+ git_annex testenv "get" [] @? "unable to get all files after merge conflict resolution in " ++ rname r
{- Simple case of conflict resolution; 2 different versions of annexed
- file. -}
@@ -1404,7 +1404,7 @@ intmpclonerepoInDirect testenv a = intmpclonerepo testenv $
, a
)
where
- isdirect = annexeval $ do
+ isdirect = annexeval $ do
Annex.Init.initialize Nothing
Config.isDirect