Browse Source

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>
maint
David Aguilar 10 years ago committed by Junio C Hamano
parent
commit
1e86d5b11d
  1. 1
      mergetools/diffmerge
  2. 1
      mergetools/emerge
  3. 1
      mergetools/kdiff3

1
mergetools/diffmerge

@ -11,5 +11,4 @@ merge_cmd () { @@ -11,5 +11,4 @@ merge_cmd () {
"$merge_tool_path" --merge \
--result="$MERGED" "$LOCAL" "$REMOTE"
fi
status=$?
}

1
mergetools/emerge

@ -15,7 +15,6 @@ merge_cmd () { @@ -15,7 +15,6 @@ merge_cmd () {
"$LOCAL" "$REMOTE" \
"$(basename "$MERGED")"
fi
status=$?
}

translate_merge_tool_path() {

1
mergetools/kdiff3

@ -20,5 +20,4 @@ merge_cmd () { @@ -20,5 +20,4 @@ merge_cmd () {
-o "$MERGED" "$LOCAL" "$REMOTE" \
>/dev/null 2>&1
fi
status=$?
}

Loading…
Cancel
Save