summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Git/Merge.hs6
1 files changed, 4 insertions, 2 deletions
diff --git a/Git/Merge.hs b/Git/Merge.hs
index 08fc6fb48..3fda34e6c 100644
--- a/Git/Merge.hs
+++ b/Git/Merge.hs
@@ -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]