Revision f1ed9d7dc0e49dc1a044941d821c9d2342313c26 authored by Junio C Hamano on 15 August 2023, 17:20:02 UTC, committed by Junio C Hamano on 15 August 2023, 17:20:02 UTC
Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent f9fe84b
emerge
diff_cmd () {
"$merge_tool_path" -f emerge-files-command "$LOCAL" "$REMOTE"
}
diff_cmd_help () {
echo "Use Emacs' Emerge"
}
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
}
merge_cmd_help () {
echo "Use Emacs' Emerge"
}
translate_merge_tool_path() {
echo emacs
}
exit_code_trustable () {
true
}
![swh spinner](/static/img/swh-spinner.gif)
Computing file changes ...