aboutsummaryrefslogtreecommitdiff
path: root/git-union-merge.hs
diff options
context:
space:
mode:
Diffstat (limited to 'git-union-merge.hs')
-rw-r--r--git-union-merge.hs2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-union-merge.hs b/git-union-merge.hs
index 31c71ba72..693064045 100644
--- a/git-union-merge.hs
+++ b/git-union-merge.hs
@@ -44,5 +44,5 @@ main = do
_ <- Git.Index.override $ tmpIndex g
setup g
Git.UnionMerge.merge aref bref g
- _ <- Git.Branch.commit "union merge" newref [aref, bref] g
+ _ <- Git.Branch.commit Git.Branch.ManualCommit False "union merge" newref [aref, bref] g
cleanup g