diff options
| author |  Joey Hess <joey@kitenet.net> | 2011-10-04 00:40:47 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2011-10-04 00:59:08 -0400 |
| commit | cfe21e85e7fba61ac588e210f2a9b75f8d081f42 (patch) | |
| tree | 3237aa5460cb38254a44a6462c83db3c2276c229 /Command/Merge.hs | |
| parent | ff21fd4a652cc6516d0e06ab885adf1c93eddced (diff) | |
rename
Diffstat (limited to 'Command/Merge.hs')
| -rw-r--r-- | Command/Merge.hs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Command/Merge.hs b/Command/Merge.hs index b365e0e0c..1de1eb6ee 100644 --- a/Command/Merge.hs +++ b/Command/Merge.hs @@ -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 |