mergetools/codecompare

   1 diff_cmd () {
   2         "$merge_tool_path" "$LOCAL" "$REMOTE"
   3 }
   4
   5 diff_cmd_help () {
   6         echo "Use Code Compare (requires a graphical session)"
   7 }
   8
   9 merge_cmd () {
  10         if $base_present
  11         then
  12                 "$merge_tool_path" -MF="$LOCAL" -TF="$REMOTE" -BF="$BASE" \
  13                         -RF="$MERGED"
  14         else
  15                 "$merge_tool_path" -MF="$LOCAL" -TF="$REMOTE" \
  16                         -RF="$MERGED"
  17         fi
  18 }
  19
  20 merge_cmd_help () {
  21         echo "Use Code Compare (requires a graphical session)"
  22 }
  23
  24 translate_merge_tool_path() {
  25         if merge_mode
  26         then
  27                 echo CodeMerge
  28         else
  29                 echo CodeCompare
  30         fi
  31 }