Subject: [PATCH 2/2] mergetools/tortoisemerge: simplify can_diff() by using "false"

From: David Aguilar <[email-masked]>
Date: Fri, 9 Dec 2016 19:21:44 -0800

Signed-off-by: David Aguilar <[email-masked]>
---
This patch builds upon da/mergetool-trust-exit-code

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

diff --git a/mergetools/tortoisemerge b/mergetools/tortoisemerge
index d7ab666a59..9067d8a4e5 100644
--- a/mergetools/tortoisemerge
+++ b/mergetools/tortoisemerge
@@ -1,5 +1,5 @@
 can_diff () {
-	return 1
+	false
 }
 
 merge_cmd () {
-- 
2.11.0.27.gdeff8c7