diff options
Diffstat (limited to 'Command/Merge.hs')
| -rw-r--r-- | Command/Merge.hs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Command/Merge.hs b/Command/Merge.hs index 6ea8a68b1..908f3c1aa 100644 --- a/Command/Merge.hs +++ b/Command/Merge.hs @@ -9,8 +9,7 @@ module Command.Merge where import Command import qualified Annex.Branch -import qualified Git.Branch -import Command.Sync (prepMerge, mergeLocal) +import Command.Sync (prepMerge, mergeLocal, getCurrBranch) cmd :: Command cmd = command "merge" SectionMaintenance @@ -34,4 +33,4 @@ mergeBranch = do mergeSynced :: CommandStart mergeSynced = do prepMerge - mergeLocal =<< inRepo Git.Branch.current + mergeLocal =<< join getCurrBranch |