mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

typo

Browse source
This commit is contained in:
Joey Hess 2012-07-17 14:51:42 -04:00
parent 4db09814e4
commit 0962d50ad2
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Git/Merge.hs
View file

@ -15,5 +15,5 @@ import Git.Version
{- Avoids recent git's interactive merge. -} {- Avoids recent git's interactive merge. -}
mergeNonInteractive :: Ref -> Repo -> IO Bool mergeNonInteractive :: Ref -> Repo -> IO Bool
mergeNonInteractive branch 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] | otherwise = runBool "merge" [Param "--no-edit", Param $ show branch]