diff options
| -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 |