From: David Aguilar <davvid@gmail.com>
Date: Sat, 10 Dec 2016 03:21:43 GMT
Subject: [PATCH 1/2] mergetools/kompare: simplify can_merge() by using "false"
Message-ID: <20161210032144.25503-1-davvid@gmail.com>

Signed-off-by: David Aguilar <davvid@gmail.com>
---
This patch builds upon da/mergetool-trust-exit-code

 mergetools/kompare | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mergetools/kompare b/mergetools/kompare
index e8c0bfa678..321022500b 100644
--- a/mergetools/kompare
+++ b/mergetools/kompare
@@ -1,5 +1,5 @@
 can_merge () {
-	return 1
+	false
 }
 
 diff_cmd () {
-- 
2.11.0.27.gdeff8c7