diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-07-17 14:50:37 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-07-17 14:50:37 -0400 |
| commit | 4db09814e4961fcb55843b9b51ad423560bb6e91 (patch) | |
| tree | f902cd54e65224e6ff1892e2c5d5188469bf9b8b /Git/Merge.hs | |
| parent | f5f88794713ebbbbc177d064f074a80ca23e9b79 (diff) | |
avoid --no-edit with older git versions
Diffstat (limited to 'Git/Merge.hs')
| -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..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] |