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

split out two more Git modules

Browse source
This commit is contained in:
Joey Hess 2011-12-13 15:22:43 -04:00
parent 25b2cc4148
commit 9db8ec210f
8 changed files with 139 additions and 117 deletions
Download patch file Download diff file Expand all files Collapse all files

3
git-union-merge.hs
View file

@ -11,6 +11,7 @@ import Common
import qualified Git.UnionMerge
import qualified Git.Config
import qualified Git.Construct
import qualified Git.Branch
import qualified Git
header :: String
@ -44,5 +45,5 @@ main = do
_ <- Git.useIndex (tmpIndex g)
setup g
Git.UnionMerge.merge aref bref g
_ <- Git.commit "union merge" newref [aref, bref] g
_ <- Git.Branch.commit "union merge" newref [aref, bref] g
cleanup g