From 1c37aaad3b248bddf67ad62c0d5514ac89f959b2 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Mon, 3 Mar 2014 16:21:36 -0400
Subject: simplfy

---
 Command/Sync.hs | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/Command/Sync.hs b/Command/Sync.hs
index e8e1d345f..eea501420 100644
--- a/Command/Sync.hs
+++ b/Command/Sync.hs
@@ -314,21 +314,17 @@ mergeFrom branch = do
 		, go
 		)
   where
-	go = runmerge $ inRepo $ Git.Merge.mergeNonInteractive branch
+	go = inRepo (Git.Merge.mergeNonInteractive branch) <||> resolveMerge
 	godirect currbranch = do
 		old <- inRepo $ Git.Ref.sha currbranch
 		d <- fromRepo gitAnnexMergeDir
-		r <- runmerge $ inRepo $ mergeDirect d branch
+		r <- inRepo (mergeDirect d branch) <||> resolveMerge
 		new <- inRepo $ Git.Ref.sha currbranch
 		case (old, new) of
 			(Just oldsha, Just newsha) ->
 				mergeDirectCleanup d oldsha newsha
 			_ -> noop
 		return r
-	runmerge a = ifM a
-		( return True
-		, resolveMerge
-		)
 
 {- Resolves a conflicted merge. It's important that any conflicts be
  - resolved in a way that itself avoids later merge conflicts, since
-- 
cgit v1.2.3