mirror of
https://github.com/git/git.git
synced 2024-11-24 02:17:02 +08:00
1e86d5b11d
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>
15 lines
275 B
Plaintext
15 lines
275 B
Plaintext
diff_cmd () {
|
|
"$merge_tool_path" "$LOCAL" "$REMOTE" >/dev/null 2>&1
|
|
}
|
|
|
|
merge_cmd () {
|
|
if $base_present
|
|
then
|
|
"$merge_tool_path" --merge --result="$MERGED" \
|
|
"$LOCAL" "$BASE" "$REMOTE"
|
|
else
|
|
"$merge_tool_path" --merge \
|
|
--result="$MERGED" "$LOCAL" "$REMOTE"
|
|
fi
|
|
}
|