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.
This commit is contained in:
parent
7b50b3c057
commit
9fd95d9025
19 changed files with 49 additions and 49 deletions
12
Test.hs
12
Test.hs
|
@ -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
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue