diff options
Diffstat (limited to 'git-union-merge.hs')
| -rw-r--r-- | git-union-merge.hs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/git-union-merge.hs b/git-union-merge.hs index f02db6be3..7c0c1cd84 100644 --- a/git-union-merge.hs +++ b/git-union-merge.hs @@ -44,5 +44,6 @@ main = do g <- Git.configRead =<< Git.repoFromCwd Git.useIndex (tmpIndex g) setup g - GitUnionMerge.merge g aref bref newref False + GitUnionMerge.merge g [aref, bref] + GitUnionMerge.commit g "union merge" newref [aref, bref] cleanup g |