diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-07-18 13:31:28 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-07-18 13:31:28 -0400 |
| commit | fc5652c811a9a644bb8964b3b8c13df24f2ec7c7 (patch) | |
| tree | e42192bfef103c749feb72db217cd4eb4487d6e6 /Git | |
| parent | 05310538ef4f2c0c483bab355083ec2044a12a0a (diff) | |
| parent | cfdd4d66029915c683a1653c941c05e45205b13a (diff) | |
Merge branch 'master' into threaded
Diffstat (limited to 'Git')
| -rw-r--r-- | Git/Merge.hs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Git/Merge.hs b/Git/Merge.hs index 08fc6fb48..bad9f8258 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] |