mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

faddle

Browse source
This commit is contained in:
Joey Hess 2010-10-12 00:53:42 -04:00
parent 107074d662
commit 92bf408c66
3 changed files with 72 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Annex.hs
View file

@ -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