diff options
Diffstat (limited to 'Annex')
| -rw-r--r-- | Annex/AutoMerge.hs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Annex/AutoMerge.hs b/Annex/AutoMerge.hs index 660d79f63..c19011e2d 100644 --- a/Annex/AutoMerge.hs +++ b/Annex/AutoMerge.hs @@ -8,6 +8,7 @@ module Annex.AutoMerge ( autoMergeFrom , resolveMerge + , commitResolvedMerge ) where import Common.Annex |