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

adjust merge config

Browse source 
*.log will merge, but foo.$backend files will not
This commit is contained in:
Joey Hess 2010-10-11 00:22:50 -04:00
parent 2bd3eea031
commit 779ebba961
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Annex.hs
View file

@ -89,7 +89,7 @@ unannexFile state file = do
gitPrep :: GitRepo -> IO ()
gitPrep repo = do
-- configure git to use union merge driver on state files
let attrLine = stateLoc ++ "/* merge=union"
let attrLine = stateLoc ++ "/*.log merge=union"
attributes <- gitAttributes repo
exists <- doesFileExist attributes
if (not exists)