mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

fix build of this

Browse source
This commit is contained in:
Joey Hess 2016-03-14 16:19:27 -04:00
parent 00d9da3534
commit a27faf6999
Failed to extract signature
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
git-union-merge.hs
View file

@ -44,5 +44,5 @@ main = do
_ <- Git.Index.override $ tmpIndex g _ <- Git.Index.override $ tmpIndex g
setup g setup g
Git.UnionMerge.merge aref bref 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 cleanup g