adjust merge config
*.log will merge, but foo.$backend files will not
This commit is contained in:
parent
2bd3eea031
commit
779ebba961
1 changed files with 1 additions and 1 deletions
2
Annex.hs
2
Annex.hs
|
@ -89,7 +89,7 @@ unannexFile state file = do
|
||||||
gitPrep :: GitRepo -> IO ()
|
gitPrep :: GitRepo -> IO ()
|
||||||
gitPrep repo = do
|
gitPrep repo = do
|
||||||
-- configure git to use union merge driver on state files
|
-- configure git to use union merge driver on state files
|
||||||
let attrLine = stateLoc ++ "/* merge=union"
|
let attrLine = stateLoc ++ "/*.log merge=union"
|
||||||
attributes <- gitAttributes repo
|
attributes <- gitAttributes repo
|
||||||
exists <- doesFileExist attributes
|
exists <- doesFileExist attributes
|
||||||
if (not exists)
|
if (not exists)
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue