diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-07-17 15:05:23 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-07-17 15:05:23 -0400 |
| commit | cfccfc19e0fca74fc7af38c0272007746193445e (patch) | |
| tree | bc4eaf8ef70fc5d105a82a4b4298e256a17a4d7e | |
| parent | 30f7b1599cd02b8b9bbbb76463c5d4f84cba3552 (diff) | |
| parent | 0962d50ad234f444d4e5157457fbeeb45d858d96 (diff) | |
Merge branch 'master' into assistant
| -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] |