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        if $base_present
   7        then
   8                "$merge_tool_path" -wait -merge -3 -a1 \
   9                        "$BASE" "$LOCAL" "$REMOTE" "$MERGED" >/dev/null 2>&1
  10        else
  11                "$merge_tool_path" -wait -2 \
  12                        "$LOCAL" "$REMOTE" "$MERGED" >/dev/null 2>&1
  13        fi
  14}
  15
  16translate_merge_tool_path() {
  17        echo compare
  18}