Skip to content

Commit

Permalink
mergetools: stop setting $status in merge_cmd()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
David Aguilar authored and Junio C Hamano committed Nov 21, 2014
1 parent 98a2602 commit 1e86d5b
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 3 deletions.
1 change: 0 additions & 1 deletion mergetools/diffmerge
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,4 @@ merge_cmd () {
"$merge_tool_path" --merge \
--result="$MERGED" "$LOCAL" "$REMOTE"
fi
status=$?
}
1 change: 0 additions & 1 deletion mergetools/emerge
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ merge_cmd () {
"$LOCAL" "$REMOTE" \
"$(basename "$MERGED")"
fi
status=$?
}

translate_merge_tool_path() {
Expand Down
1 change: 0 additions & 1 deletion mergetools/kdiff3
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,4 @@ merge_cmd () {
-o "$MERGED" "$LOCAL" "$REMOTE" \
>/dev/null 2>&1
fi
status=$?
}

0 comments on commit 1e86d5b

Please sign in to comment.