mergetools/emerge

   1 diff_cmd () {
   2         "$merge_tool_path" -f emerge-files-command "$LOCAL" "$REMOTE"
   3 }
   4
   5 diff_cmd_help () {
   6         echo "Use Emacs' Emerge"
   7 }
   8
   9 merge_cmd () {
  10         if $base_present
  11         then
  12                 "$merge_tool_path" \
  13                         -f emerge-files-with-ancestor-command \
  14                         "$LOCAL" "$REMOTE" "$BASE" \
  15                         "$(basename "$MERGED")"
  16         else
  17                 "$merge_tool_path" \
  18                         -f emerge-files-command \
  19                         "$LOCAL" "$REMOTE" \
  20                         "$(basename "$MERGED")"
  21         fi
  22 }
  23
  24 merge_cmd_help () {
  25         echo "Use Emacs' Emerge"
  26 }
  27
  28 translate_merge_tool_path() {
  29         echo emacs
  30 }
  31
  32 exit_code_trustable () {
  33         true
  34 }