split out two more Git modules
This commit is contained in:
parent
25b2cc4148
commit
9db8ec210f
8 changed files with 139 additions and 117 deletions
|
@ -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
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue