diff options
author | Joey Hess <joey@kitenet.net> | 2010-10-12 00:53:42 -0400 |
---|---|---|
committer | Joey Hess <joey@kitenet.net> | 2010-10-12 00:53:42 -0400 |
commit | 92bf408c664e4fa66132a7095e1f856312ce667c (patch) | |
tree | d5b98170eac039b4b2c75e1366f1e74ee6c29412 /Annex.hs | |
parent | 107074d6623a687d046615a5034af10be7ff1756 (diff) |
faddle
Diffstat (limited to 'Annex.hs')
-rw-r--r-- | Annex.hs | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -86,7 +86,7 @@ gitPrep :: GitRepo -> IO () gitPrep repo = do -- configure git to use union merge driver on state files let attrLine = stateLoc ++ "/*.log merge=union" - attributes <- gitAttributes repo + let attributes = gitAttributes repo exists <- doesFileExist attributes if (not exists) then do |