diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-06-23 10:29:46 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-06-23 10:29:46 -0400 |
| commit | 19eee6a1df2a6c724e6d6dbe842b40dc1c17f65b (patch) | |
| tree | 300857b23cb05bf6b2c89005bdad65eca1e082ba | |
| parent | d88ee75a2de7c0294a28a8b4309e424608389cc5 (diff) | |
noninteractive merge
| -rw-r--r-- | Assistant/Merger.hs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Assistant/Merger.hs b/Assistant/Merger.hs index fbdf9ca01..988cbd8a6 100644 --- a/Assistant/Merger.hs +++ b/Assistant/Merger.hs @@ -12,7 +12,7 @@ import Assistant.ThreadedMonad import Utility.DirWatcher import Utility.Types.DirWatcher import qualified Git -import qualified Git.Command +import qualified Git.Merge import qualified Git.Branch import qualified Command.Sync @@ -69,5 +69,4 @@ onAdd g file _ void $ mergeBranch branch g mergeBranch :: Git.Ref -> Git.Repo -> IO Bool -mergeBranch branch = Git.Command.runBool "merge" - [Param $ show $ Command.Sync.syncBranch branch] +mergeBranch = Git.Merge.mergeNonInteractive . Command.Sync.syncBranch |