You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
24 lines
415 B
24 lines
415 B
13 years ago
|
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
|
||
|
|
}
|