diff options
author | Joey Hess <joey@kitenet.net> | 2014-10-09 15:09:26 -0400 |
---|---|---|
committer | Joey Hess <joey@kitenet.net> | 2014-10-09 15:09:26 -0400 |
commit | adb4603fbf69d8638d925627e0c85b473a3fef05 (patch) | |
tree | 789d7d7a1075d6d947143f391eca86a58f1f46ea /Test.hs | |
parent | a26b7127d4cc8b2a5e15ef662ab2793dbf9e7919 (diff) |
indent with tabs not spaces
Found these with:
git grep "^ " $(find -type f -name \*.hs) |grep -v ': where'
Unfortunately there is some inline hamlet that cannot use tabs for
indentation.
Also, Assistant/WebApp/Bootstrap3.hs is a copy of a module and so I'm
leaving it as-is.
Diffstat (limited to 'Test.hs')
-rw-r--r-- | Test.hs | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -943,12 +943,12 @@ test_remove_conflict_resolution testenv = do length v == 1 @? (what ++ " too many variant files in: " ++ show v) - {- Check merge confalict resolution when a file is annexed in one repo, - - and checked directly into git in the other repo. - - - - This test requires indirect mode to set it up, but tests both direct and - - indirect mode. - -} +{- Check merge confalict resolution when a file is annexed in one repo, + - and checked directly into git in the other repo. + - + - This test requires indirect mode to set it up, but tests both direct and + - indirect mode. + -} test_nonannexed_file_conflict_resolution :: TestEnv -> Assertion test_nonannexed_file_conflict_resolution testenv = do check True False |