faddle
This commit is contained in:
parent
107074d662
commit
92bf408c66
3 changed files with 72 additions and 33 deletions
2
Annex.hs
2
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
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue