diff options
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 |