diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2016-03-14 16:19:27 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-03-14 16:19:27 -0400 |
| commit | 0ca84a5da638e4a5e0da02555819182b3b9de715 (patch) | |
| tree | 2f1cee1293049c78157b304378d733168677835e /git-union-merge.hs | |
| parent | 168f26320bb4dd0bc76e4c0c0b7383c1f6f6f661 (diff) | |
fix build of this
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 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 |