diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-07-17 14:51:42 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-07-17 14:51:42 -0400 |
| commit | 0962d50ad234f444d4e5157457fbeeb45d858d96 (patch) | |
| tree | 14ae71276f7c368044d52d45bcf1e2a6ab872359 /Git/Merge.hs | |
| parent | 4db09814e4961fcb55843b9b51ad423560bb6e91 (diff) | |
typo
Diffstat (limited to 'Git/Merge.hs')
| -rw-r--r-- | Git/Merge.hs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Git/Merge.hs b/Git/Merge.hs index 3fda34e6c..bad9f8258 100644 --- a/Git/Merge.hs +++ b/Git/Merge.hs @@ -15,5 +15,5 @@ import Git.Version {- Avoids recent git's interactive merge. -} mergeNonInteractive :: Ref -> Repo -> IO Bool mergeNonInteractive branch - | older 1.7.7.6 = runBool "merge" [Param $ show branch] + | older "1.7.7.6" = runBool "merge" [Param $ show branch] | otherwise = runBool "merge" [Param "--no-edit", Param $ show branch] |