From 1e86d5b11dcf31adf11363caa1e96a94612b16f4 Mon Sep 17 00:00:00 2001 From: David Aguilar 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 Signed-off-by: Junio C Hamano --- mergetools/diffmerge | 1 - mergetools/emerge | 1 - mergetools/kdiff3 | 1 - 3 files changed, 3 deletions(-) (limited to 'mergetools') diff --git a/mergetools/diffmerge b/mergetools/diffmerge index 85ac72015..f138cb4e7 100644 --- a/mergetools/diffmerge +++ b/mergetools/diffmerge @@ -11,5 +11,4 @@ merge_cmd () { "$merge_tool_path" --merge \ --result="$MERGED" "$LOCAL" "$REMOTE" fi - status=$? } diff --git a/mergetools/emerge b/mergetools/emerge index f96d9e550..7b895fdb1 100644 --- a/mergetools/emerge +++ b/mergetools/emerge @@ -15,7 +15,6 @@ merge_cmd () { "$LOCAL" "$REMOTE" \ "$(basename "$MERGED")" fi - status=$? } translate_merge_tool_path() { diff --git a/mergetools/kdiff3 b/mergetools/kdiff3 index a30034f11..793d1293b 100644 --- a/mergetools/kdiff3 +++ b/mergetools/kdiff3 @@ -20,5 +20,4 @@ merge_cmd () { -o "$MERGED" "$LOCAL" "$REMOTE" \ >/dev/null 2>&1 fi - status=$? } -- cgit v1.2.1