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 659f14080..31db7a99f 100644 --- a/Command/Merge.hs +++ b/Command/Merge.hs @@ -11,7 +11,7 @@ import Common.Annex import Command import qualified Annex.Branch import qualified Git.Branch -import Command.Sync (mergeLocal) +import Command.Sync (prepMerge, mergeLocal) def :: [Command] def = [command "merge" paramNothing seek SectionMaintenance @@ -34,5 +34,5 @@ mergeBranch = do mergeSynced :: CommandStart mergeSynced = do - branch <- inRepo Git.Branch.current - maybe stop mergeLocal branch + prepMerge + mergeLocal =<< inRepo Git.Branch.current |