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