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

export the commit function and generalize

Browse source
This commit is contained in:
Joey Hess 2011-06-21 19:09:20 -04:00
parent 40ec8a9726
commit 5d20ac5800
2 changed files with 14 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
git-union-merge.hs
View file

@ -10,7 +10,7 @@ import System.FilePath
import System.Directory
import Control.Monad (when)
import GitUnionMerge
import qualified GitUnionMerge
import qualified GitRepo as Git
header :: String
@ -44,5 +44,5 @@ main = do
g <- Git.configRead =<< Git.repoFromCwd
Git.useIndex (tmpIndex g)
setup g
unionMerge g aref bref newref False
GitUnionMerge.merge g aref bref newref False
cleanup g