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

update comments

Browse source
This commit is contained in:
Joey Hess 2020-09-07 13:03:51 -04:00
parent 69053a93a2
commit 5abb0f86c4
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Git/Merge.hs
View file

@ -22,9 +22,9 @@ import Git.Branch (CommitMode(..))
data MergeConfig data MergeConfig
= MergeNonInteractive = MergeNonInteractive
-- ^ avoids recent git's interactive merge -- ^ avoids interactive merge
| MergeUnrelatedHistories | MergeUnrelatedHistories
-- ^ avoids recent git's prevention of merging unrelated histories -- ^ avoids git's prevention of merging unrelated histories
deriving (Eq) deriving (Eq)
merge :: Ref -> [MergeConfig] -> CommitMode -> Repo -> IO Bool merge :: Ref -> [MergeConfig] -> CommitMode -> Repo -> IO Bool