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>
This commit is contained in:
parent
98a260220c
commit
1e86d5b11d
@ -11,5 +11,4 @@ merge_cmd () {
|
|||||||
"$merge_tool_path" --merge \
|
"$merge_tool_path" --merge \
|
||||||
--result="$MERGED" "$LOCAL" "$REMOTE"
|
--result="$MERGED" "$LOCAL" "$REMOTE"
|
||||||
fi
|
fi
|
||||||
status=$?
|
|
||||||
}
|
}
|
||||||
|
@ -15,7 +15,6 @@ merge_cmd () {
|
|||||||
"$LOCAL" "$REMOTE" \
|
"$LOCAL" "$REMOTE" \
|
||||||
"$(basename "$MERGED")"
|
"$(basename "$MERGED")"
|
||||||
fi
|
fi
|
||||||
status=$?
|
|
||||||
}
|
}
|
||||||
|
|
||||||
translate_merge_tool_path() {
|
translate_merge_tool_path() {
|
||||||
|
@ -20,5 +20,4 @@ merge_cmd () {
|
|||||||
-o "$MERGED" "$LOCAL" "$REMOTE" \
|
-o "$MERGED" "$LOCAL" "$REMOTE" \
|
||||||
>/dev/null 2>&1
|
>/dev/null 2>&1
|
||||||
fi
|
fi
|
||||||
status=$?
|
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user