From 1d37da3392276c16d49a3680e9bd6c22f2c3abd0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Mart=C3=ADn=20Nieto?= <cmn@dwim.me>
Date: Wed, 30 Oct 2013 16:25:49 +0100
Subject: [PATCH] merge: any non-zero return from the user is an error

This fixes #1703.
---
 src/merge.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/merge.c b/src/merge.c
index b07e8c52f..a22801e48 100644
--- a/src/merge.c
+++ b/src/merge.c
@@ -285,7 +285,7 @@ int git_repository_mergehead_foreach(git_repository *repo,
 		if ((error = git_oid_fromstr(&oid, line)) < 0)
 			goto cleanup;
 
-		if (cb(&oid, payload) < 0) {
+		if (cb(&oid, payload) != 0) {
 			error = GIT_EUSER;
 			goto cleanup;
 		}