diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-07-11 16:45:18 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-07-11 16:45:18 -0400 |
| commit | 2a727e8c5f8d003af7102ea7de22e45a5faec421 (patch) | |
| tree | 661d008aeb7f13c873c9afb7dcfa360aed60a528 /Annex | |
| parent | 64b74f4c616bd1aa42e7833b449586b64dac1ba5 (diff) | |
resolvemerge: New plumbing command that runs the automatic merge conflict resolver.
Diffstat (limited to 'Annex')
| -rw-r--r-- | Annex/AutoMerge.hs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Annex/AutoMerge.hs b/Annex/AutoMerge.hs index d587e03d1..6695c6d38 100644 --- a/Annex/AutoMerge.hs +++ b/Annex/AutoMerge.hs @@ -5,7 +5,10 @@ - Licensed under the GNU GPL version 3 or higher. -} -module Annex.AutoMerge (autoMergeFrom) where +module Annex.AutoMerge + ( autoMergeFrom + , resolveMerge + ) where import Common.Annex import qualified Annex.Queue |