Ricardo@FX-8150 MINGW64 /d/OpenTTD/OpenTTD GitHub/OpenTTD (EnsureNoShipFromDiagDirs)
$ git fetch upstream

Ricardo@FX-8150 MINGW64 /d/OpenTTD/OpenTTD GitHub/OpenTTD (EnsureNoShipFromDiagDirs)
$ git rebase upstream/master
First, rewinding head to replay your work on top of it...
Applying: Add: EnsureNoShipFromDiagDirs
Using index info to reconstruct a base tree...
M       src/industry_cmd.cpp
M       src/rail_cmd.cpp
M       src/station_cmd.cpp
M       src/town_cmd.cpp
M       src/tunnelbridge_cmd.cpp
M       src/vehicle.cpp
M       src/vehicle_func.h
M       src/water_cmd.cpp
Falling back to patching base and 3-way merge...
Auto-merging src/water_cmd.cpp
Auto-merging src/vehicle_func.h
Auto-merging src/vehicle.cpp
Auto-merging src/tunnelbridge_cmd.cpp
Auto-merging src/town_cmd.cpp
Auto-merging src/station_cmd.cpp
Auto-merging src/rail_cmd.cpp
Auto-merging src/industry_cmd.cpp

Ricardo@FX-8150 MINGW64 /d/OpenTTD/OpenTTD GitHub/OpenTTD (EnsureNoShipFromDiagDirs)