diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2016-04-27 13:54:46 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-04-27 13:54:46 -0400 |
| commit | 1f9cf1bf452a1edceb9f3b36d2e5b6083703b1a4 (patch) | |
| tree | 917889d6b424bf5049b3a91f6d8979cf30d85631 /Git | |
| parent | 87d953fd2f2b40c24eb4c796f0e78a2399fc9020 (diff) | |
--allow-unrelated-histories will be in git 2.9.0, not 2.8.2
Also, I had the logic backwards in the version comparison.
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 |