diff options
Diffstat (limited to 'Command/Merge.hs')
-rw-r--r-- | Command/Merge.hs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Command/Merge.hs b/Command/Merge.hs index 80a8227d1..4f99093ab 100644 --- a/Command/Merge.hs +++ b/Command/Merge.hs @@ -33,4 +33,4 @@ mergeBranch = do mergeSynced :: CommandStart mergeSynced = do prepMerge - mergeLocal mergeConfig =<< join getCurrBranch + mergeLocal mergeConfig def =<< join getCurrBranch |