summaryrefslogtreecommitdiff
path: root/Annex.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2010-10-12 00:53:42 -0400
committerGravatar Joey Hess <joey@kitenet.net>2010-10-12 00:53:42 -0400
commit92bf408c664e4fa66132a7095e1f856312ce667c (patch)
treed5b98170eac039b4b2c75e1366f1e74ee6c29412 /Annex.hs
parent107074d6623a687d046615a5034af10be7ff1756 (diff)
faddle
Diffstat (limited to 'Annex.hs')
-rw-r--r--Annex.hs2
1 files changed, 1 insertions, 1 deletions
diff --git a/Annex.hs b/Annex.hs
index abb7bff6e..5a7274ca1 100644
--- a/Annex.hs
+++ b/Annex.hs
@@ -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