| David Aguilar | bc7a96a | 2011-08-18 00:23:46 -0700 | [diff] [blame] | 1 | diff_cmd () { |
| 2 | "$merge_tool_path" -f emerge-files-command "$LOCAL" "$REMOTE" | ||||
| 3 | } | ||||
| 4 | |||||
| 5 | merge_cmd () { | ||||
| 6 | if $base_present | ||||
| 7 | then | ||||
| 8 | "$merge_tool_path" \ | ||||
| 9 | -f emerge-files-with-ancestor-command \ | ||||
| 10 | "$LOCAL" "$REMOTE" "$BASE" \ | ||||
| 11 | "$(basename "$MERGED")" | ||||
| 12 | else | ||||
| 13 | "$merge_tool_path" \ | ||||
| 14 | -f emerge-files-command \ | ||||
| 15 | "$LOCAL" "$REMOTE" \ | ||||
| 16 | "$(basename "$MERGED")" | ||||
| 17 | fi | ||||
| 18 | status=$? | ||||
| 19 | } | ||||
| 20 | |||||
| 21 | translate_merge_tool_path() { | ||||
| 22 | echo emacs | ||||
| 23 | } | ||||