summaryrefslogtreecommitdiff
path: root/Annex
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2014-07-11 16:59:49 -0400
committerGravatar Joey Hess <joey@kitenet.net>2014-07-11 16:59:49 -0400
commit05f2d344a2933fdaf7422bba811bb8670c0d23b5 (patch)
tree831bcdab3578f0420fb12d655d8986ae8607f7f4 /Annex
parent88a52a5c74e5035c33533c65819d284eb9d3ac5e (diff)
resolvemerge: finish up by committing
Diffstat (limited to 'Annex')
-rw-r--r--Annex/AutoMerge.hs1
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