diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2016-04-22 14:35:48 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-04-22 14:35:48 -0400 |
| commit | fa6877f1eae8fa581fa3266cfc5774a642fb9873 (patch) | |
| tree | b24a911b0f483ce618ab396935f4f7f717d3bd43 /Command/Merge.hs | |
| parent | c4b2bd9869c4cc1ae036e5be9d1032fb1ee99804 (diff) | |
refactor
Diffstat (limited to 'Command/Merge.hs')
| -rw-r--r-- | Command/Merge.hs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Command/Merge.hs b/Command/Merge.hs index 908f3c1aa..4f1913978 100644 --- a/Command/Merge.hs +++ b/Command/Merge.hs @@ -9,7 +9,7 @@ module Command.Merge where import Command import qualified Annex.Branch -import Command.Sync (prepMerge, mergeLocal, getCurrBranch) +import Command.Sync (prepMerge, mergeLocal, getCurrBranch, mergeConfig) cmd :: Command cmd = command "merge" SectionMaintenance @@ -33,4 +33,4 @@ mergeBranch = do mergeSynced :: CommandStart mergeSynced = do prepMerge - mergeLocal =<< join getCurrBranch + mergeLocal mergeConfig =<< join getCurrBranch |