mirror of
https://github.com/git/git.git
synced 2024-11-05 08:47:56 +01: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>
22 lines
404 B
Text
22 lines
404 B
Text
diff_cmd () {
|
|
"$merge_tool_path" -f emerge-files-command "$LOCAL" "$REMOTE"
|
|
}
|
|
|
|
merge_cmd () {
|
|
if $base_present
|
|
then
|
|
"$merge_tool_path" \
|
|
-f emerge-files-with-ancestor-command \
|
|
"$LOCAL" "$REMOTE" "$BASE" \
|
|
"$(basename "$MERGED")"
|
|
else
|
|
"$merge_tool_path" \
|
|
-f emerge-files-command \
|
|
"$LOCAL" "$REMOTE" \
|
|
"$(basename "$MERGED")"
|
|
fi
|
|
}
|
|
|
|
translate_merge_tool_path() {
|
|
echo emacs
|
|
}
|