adjust merge config

*.log will merge, but foo.$backend files will not

1 files changed, 1 insertions, 1 deletions

diff --git a/Annex.hs b/Annex.hs
index 882ed2761..e3956cbf2 100644
--- a/Annex.hs
+++ b/Annex.hs
@@ -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)