From 1e86d5b11dcf31adf11363caa1e96a94612b16f4 Mon Sep 17 00:00:00 2001
From: David Aguilar <davvid@gmail.com>
Date: Fri, 21 Nov 2014 01:03:10 -0800
Subject: mergetools: stop setting $status in merge_cmd()

No callers rely on $status so there's don't need to set
it during merge_cmd() for diffmerge, emerge, and kdiff3.

Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
 mergetools/diffmerge | 1 -
 1 file changed, 1 deletion(-)

(limited to 'mergetools/diffmerge')

diff --git a/mergetools/diffmerge b/mergetools/diffmerge
index 85ac720157..f138cb4e73 100644
--- a/mergetools/diffmerge
+++ b/mergetools/diffmerge
@@ -11,5 +11,4 @@ merge_cmd () {
 		"$merge_tool_path" --merge \
 			--result="$MERGED" "$LOCAL" "$REMOTE"
 	fi
-	status=$?
 }
-- 
cgit v1.2.3