Andrew's git - gitweb.git/blob

   1diff_cmd () {
   2        "$merge_tool_path" -wait -2 "$LOCAL" "$REMOTE" >/dev/null 2>&1
   3}
   4
   5merge_cmd () {
   6        touch "$BACKUP"
   7        if $base_present
   8        then
   9                "$merge_tool_path" -wait -merge -3 -a1 \
  10                        "$BASE" "$LOCAL" "$REMOTE" "$MERGED" >/dev/null 2>&1
  11        else
  12                "$merge_tool_path" -wait -2 \
  13                        "$LOCAL" "$REMOTE" "$MERGED" >/dev/null 2>&1
  14        fi
  15        check_unchanged
  16}
  17
  18translate_merge_tool_path() {
  19        echo compare
  20}