diff options
| author |  Joey Hess <joey@kitenet.net> | 2011-10-07 13:17:54 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2011-10-07 13:36:48 -0400 |
| commit | 3acdba3995941907028905a7c18362309af924b5 (patch) | |
| tree | 73defda86adbd59c19f7e23eed8581d97f6aa69a /git-union-merge.hs | |
| parent | 5414bbce58041aa92f2a50a8e721507879000f77 (diff) | |
faster union merge of multiple branches into index
only write index once
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 |