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

rename GitUnionMerge to Git.UnionMerge

Browse source 
Also, moved commit function into Git proper, it's not union merge specific.
This commit is contained in:
Joey Hess 2011-06-30 13:32:47 -04:00
parent f0497312a7
commit 896726cde4
4 changed files with 40 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

6
git-union-merge.hs
View file

@ -10,7 +10,7 @@ import System.FilePath
import System.Directory
import Control.Monad (when)
import qualified GitUnionMerge
import qualified Git.UnionMerge
import qualified Git
header :: String
@ -44,6 +44,6 @@ main = do
g <- Git.configRead =<< Git.repoFromCwd
_ <- Git.useIndex (tmpIndex g)
setup g
GitUnionMerge.merge g [aref, bref]
GitUnionMerge.commit g "union merge" newref [aref, bref]
Git.UnionMerge.merge g [aref, bref]
Git.commit g "union merge" newref [aref, bref]
cleanup g