mirror of
https://github.com/git/git
synced 2024-11-05 18:59:29 +00:00
24 lines
415 B
Text
24 lines
415 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
|
||
|
|
status=$?
|
||
|
|
}
|
||
|
|
|
||
|
|
translate_merge_tool_path() {
|
||
|
|
echo emacs
|
||
|
|
}
|