better git version checking

This commit is contained in:
Joey Hess 2013-08-02 18:31:01 -04:00
parent 1452ac38aa
commit 672cfc3923
7 changed files with 52 additions and 27 deletions

View file

@ -10,7 +10,7 @@ module Git.Merge where
import Common
import Git
import Git.Command
import Git.Version
import Git.BuildVersion
{- Avoids recent git's interactive merge. -}
mergeNonInteractive :: Ref -> Repo -> IO Bool