diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-06-23 10:27:12 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-06-23 10:27:12 -0400 |
| commit | d88ee75a2de7c0294a28a8b4309e424608389cc5 (patch) | |
| tree | 5838651ebcac3426229e302b7758a19e81822143 /Command/Sync.hs | |
| parent | d707f2dce5c3ed1a56c7bf3d65be7bef105f5dd1 (diff) | |
| parent | 325053e8de109329eac31017271134b1c5faef04 (diff) | |
Merge branch 'master' into assistant
Diffstat (limited to 'Command/Sync.hs')
| -rw-r--r-- | Command/Sync.hs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Command/Sync.hs b/Command/Sync.hs index 110cf2a6c..912ce944c 100644 --- a/Command/Sync.hs +++ b/Command/Sync.hs @@ -16,6 +16,7 @@ import qualified Remote import qualified Annex import qualified Annex.Branch import qualified Git.Command +import qualified Git.Merge import qualified Git.Branch import qualified Git.Ref import qualified Git @@ -170,7 +171,7 @@ mergeAnnex = do mergeFrom :: Git.Ref -> CommandCleanup mergeFrom branch = do showOutput - inRepo $ Git.Command.runBool "merge" [Param $ show branch] + inRepo $ Git.Merge.mergeNonInteractive branch changed :: Remote -> Git.Ref -> Annex Bool changed remote b = do |