summaryrefslogtreecommitdiff
path: root/Command/PostReceive.hs
diff options
context:
space:
mode:
Diffstat (limited to 'Command/PostReceive.hs')
-rw-r--r--Command/PostReceive.hs2
1 files changed, 1 insertions, 1 deletions
diff --git a/Command/PostReceive.hs b/Command/PostReceive.hs
index ffb5516a2..4db775214 100644
--- a/Command/PostReceive.hs
+++ b/Command/PostReceive.hs
@@ -48,4 +48,4 @@ fixPostReceiveHookEnv = do
updateInsteadEmulation :: CommandStart
updateInsteadEmulation = do
prepMerge
- mergeLocal mergeConfig =<< join getCurrBranch
+ mergeLocal mergeConfig def =<< join getCurrBranch