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 2019-08-13 13:36:52 -04:00
parent 4a4a5dd5f9
commit 88c61dea00
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Command/Merge.hs
View file

@ -41,4 +41,4 @@ mergeSyncedBranch = mergeLocal mergeConfig def =<< getCurrentBranch
mergeBranch :: Git.Ref -> CommandStart mergeBranch :: Git.Ref -> CommandStart
mergeBranch r = starting "merge" (ActionItemOther (Just (Git.fromRef r))) $ do mergeBranch r = starting "merge" (ActionItemOther (Just (Git.fromRef r))) $ do
currbranch <- getCurrentBranch currbranch <- getCurrentBranch
nest $ merge currbranch mergeConfig def Git.Branch.ManualCommit r next $ merge currbranch mergeConfig def Git.Branch.ManualCommit r