diff options
Diffstat (limited to 'Git')
| -rw-r--r-- | Git/Merge.hs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Git/Merge.hs b/Git/Merge.hs index 76ea35ddd..a0767e462 100644 --- a/Git/Merge.hs +++ b/Git/Merge.hs @@ -45,9 +45,9 @@ merge' extraparams branch mergeconfig commitmode r merge'' :: [CommandParam] -> [MergeConfig] -> Repo -> IO Bool merge'' ps mergeconfig r | MergeUnrelatedHistories `elem` mergeconfig = - ifM (Git.Version.older "2.8.2") - ( go (ps ++ [Param "--allow-unrelated-histories"]) - , go ps + ifM (Git.Version.older "2.9.0") + ( go ps + , go (ps ++ [Param "--allow-unrelated-histories"]) ) | otherwise = go ps where |