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

rename

Browse source
This commit is contained in:
Joey Hess 2011-10-04 00:40:47 -04:00
parent ff21fd4a65
commit cfe21e85e7
73 changed files with 173 additions and 173 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Command/Merge.hs
View file

@ -7,9 +7,9 @@
module Command.Merge where
import AnnexCommon
import Annex.Common
import Command
import qualified Branch
import qualified Annex.Branch
command :: [Command]
command = [repoCommand "merge" paramNothing seek
@ -25,5 +25,5 @@ start = do
perform :: CommandPerform
perform = do
Branch.update
Annex.Branch.update
next $ return True