diff options
author | Joey Hess <joey@kitenet.net> | 2013-11-14 17:04:58 -0400 |
---|---|---|
committer | Joey Hess <joey@kitenet.net> | 2013-11-14 17:04:58 -0400 |
commit | 521ef9dfebd6a9418a5dce7d1686dbf353ddd0a0 (patch) | |
tree | afe6bb5d52e21a049f04020ae448afb81adc02a7 /Command/Merge.hs | |
parent | f4b4f327b69189d24663a7db6407c1f7a6e48fdd (diff) | |
parent | 5c6f6e4d0abb9b4856908a500611044b3b7a48e6 (diff) |
Merge branch 'master' into tasty-tests
Conflicts:
Test.hs
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 |