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

Merge branch 'master' into assistant

Browse source
This commit is contained in:
Joey Hess 2012-07-17 15:05:23 -04:00
commit cfccfc19e0
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Git/Merge.hs
View file

@ -10,8 +10,10 @@ module Git.Merge where
import Common
import Git
import Git.Command
import Git.Version
{- Avoids recent git's interactive merge. -}
mergeNonInteractive :: Ref -> Repo -> IO Bool
mergeNonInteractive branch = runBool "merge"
[Param "--no-edit", Param $ show branch]
mergeNonInteractive branch
| older "1.7.7.6" = runBool "merge" [Param $ show branch]
| otherwise = runBool "merge" [Param "--no-edit", Param $ show branch]