diff options
Diffstat (limited to 'git-union-merge.hs')
| -rw-r--r-- | git-union-merge.hs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-union-merge.hs b/git-union-merge.hs index 34f22d06f..0d1d0819d 100644 --- a/git-union-merge.hs +++ b/git-union-merge.hs @@ -41,6 +41,6 @@ main = do g <- Git.configRead =<< Git.repoFromCwd _ <- Git.useIndex (tmpIndex g) setup g - Git.UnionMerge.merge g [aref, bref] + Git.UnionMerge.merge g aref bref Git.commit g "union merge" newref [aref, bref] cleanup g |