First, rewinding head to replay your work on top of it...
Applying: Feature: Add NotRoadTypes (NRT)
Using index info to reconstruct a base tree...
M	docs/landscape.html
M	docs/landscape_grid.html
M	media/extra_grf/openttdgui.png
A	projects/openttd_vs100.vcxproj
A	projects/openttd_vs100.vcxproj.filters
M	projects/openttd_vs140.vcxproj
M	projects/openttd_vs140.vcxproj.filters
A	projects/openttd_vs80.vcproj
A	projects/openttd_vs90.vcproj
M	source.list
M	src/autoreplace_cmd.cpp
M	src/autoreplace_gui.cpp
M	src/bridge_gui.cpp
M	src/bridge_map.h
M	src/command.cpp
M	src/company_base.h
M	src/company_cmd.cpp
M	src/company_gui.cpp
M	src/economy.cpp
M	src/engine.cpp
M	src/ground_vehicle.cpp
M	src/lang/afrikaans.txt
M	src/lang/arabic_egypt.txt
M	src/lang/basque.txt
M	src/lang/belarusian.txt
M	src/lang/brazilian_portuguese.txt
M	src/lang/bulgarian.txt
M	src/lang/catalan.txt
M	src/lang/croatian.txt
M	src/lang/czech.txt
M	src/lang/danish.txt
M	src/lang/dutch.txt
M	src/lang/english.txt
M	src/lang/english_AU.txt
M	src/lang/english_US.txt
M	src/lang/esperanto.txt
M	src/lang/estonian.txt
M	src/lang/faroese.txt
M	src/lang/finnish.txt
M	src/lang/french.txt
M	src/lang/gaelic.txt
M	src/lang/galician.txt
M	src/lang/german.txt
M	src/lang/greek.txt
M	src/lang/hebrew.txt
M	src/lang/hungarian.txt
M	src/lang/icelandic.txt
M	src/lang/indonesian.txt
M	src/lang/irish.txt
M	src/lang/italian.txt
M	src/lang/japanese.txt
M	src/lang/korean.txt
M	src/lang/latin.txt
M	src/lang/latvian.txt
M	src/lang/lithuanian.txt
M	src/lang/luxembourgish.txt
M	src/lang/malay.txt
M	src/lang/norwegian_bokmal.txt
M	src/lang/norwegian_nynorsk.txt
M	src/lang/polish.txt
M	src/lang/portuguese.txt
M	src/lang/romanian.txt
M	src/lang/russian.txt
M	src/lang/serbian.txt
M	src/lang/simplified_chinese.txt
M	src/lang/slovak.txt
M	src/lang/slovenian.txt
M	src/lang/spanish.txt
M	src/lang/spanish_MX.txt
M	src/lang/swedish.txt
M	src/lang/tamil.txt
M	src/lang/thai.txt
M	src/lang/traditional_chinese.txt
M	src/lang/turkish.txt
M	src/lang/ukrainian.txt
M	src/lang/unfinished/frisian.txt
M	src/lang/unfinished/macedonian.txt
M	src/lang/unfinished/persian.txt
M	src/lang/unfinished/urdu.txt
M	src/lang/vietnamese.txt
M	src/lang/welsh.txt
M	src/misc_gui.cpp
M	src/newgrf.cpp
M	src/openttd.cpp
M	src/pathfinder/follow_track.hpp
M	src/pathfinder/npf/npf.cpp
M	src/pathfinder/yapf/yapf_costrail.hpp
M	src/pathfinder/yapf/yapf_road.cpp
M	src/rail_cmd.cpp
M	src/rail_gui.cpp
M	src/road_cmd.cpp
M	src/road_func.h
M	src/road_map.h
M	src/roadveh_cmd.cpp
M	src/saveload/afterload.cpp
M	src/saveload/company_sl.cpp
M	src/saveload/saveload.cpp
M	src/script/api/ai_changelog.hpp
M	src/script/api/game/game_window.hpp.sq
M	src/script/api/game_changelog.hpp
M	src/script/api/script_window.hpp
M	src/smallmap_gui.cpp
M	src/station_cmd.cpp
M	src/station_map.h
M	src/table/newgrf_debug_data.h
M	src/toolbar_gui.cpp
M	src/town_cmd.cpp
M	src/tunnel_map.h
M	src/tunnelbridge_cmd.cpp
M	src/vehicle.cpp
Falling back to patching base and 3-way merge...
Auto-merging src/vehicle.cpp
Auto-merging src/tunnelbridge_cmd.cpp
CONFLICT (content): Merge conflict in src/tunnelbridge_cmd.cpp
Auto-merging src/tunnel_map.h
Auto-merging src/town_cmd.cpp
Auto-merging src/toolbar_gui.cpp
CONFLICT (content): Merge conflict in src/toolbar_gui.cpp
Auto-merging src/table/newgrf_debug_data.h
Auto-merging src/station_map.h
Auto-merging src/station_cmd.cpp
Auto-merging src/smallmap_gui.cpp
Auto-merging src/script/api/script_window.hpp
Auto-merging src/script/api/game_changelog.hpp
Auto-merging src/script/api/game/game_window.hpp.sq
Auto-merging src/script/api/ai_changelog.hpp
Auto-merging src/saveload/saveload.cpp
CONFLICT (content): Merge conflict in src/saveload/saveload.cpp
Auto-merging src/saveload/company_sl.cpp
Auto-merging src/saveload/afterload.cpp
CONFLICT (content): Merge conflict in src/saveload/afterload.cpp
Auto-merging src/roadveh_cmd.cpp
Auto-merging src/road_map.h
CONFLICT (content): Merge conflict in src/road_map.h
Auto-merging src/road_func.h
Auto-merging src/road_cmd.cpp
Auto-merging src/rail_gui.cpp
Auto-merging src/rail_cmd.cpp
Auto-merging src/pathfinder/yapf/yapf_road.cpp
CONFLICT (content): Merge conflict in src/pathfinder/yapf/yapf_road.cpp
Auto-merging src/pathfinder/yapf/yapf_costrail.hpp
Auto-merging src/pathfinder/npf/npf.cpp
CONFLICT (content): Merge conflict in src/pathfinder/npf/npf.cpp
Auto-merging src/pathfinder/follow_track.hpp
CONFLICT (content): Merge conflict in src/pathfinder/follow_track.hpp
Auto-merging src/openttd.cpp
Auto-merging src/newgrf.cpp
Auto-merging src/misc_gui.cpp
Auto-merging src/lang/welsh.txt
Auto-merging src/lang/vietnamese.txt
Auto-merging src/lang/unfinished/urdu.txt
Auto-merging src/lang/unfinished/persian.txt
Auto-merging src/lang/unfinished/macedonian.txt
Auto-merging src/lang/unfinished/frisian.txt
Auto-merging src/lang/ukrainian.txt
Auto-merging src/lang/turkish.txt
Auto-merging src/lang/traditional_chinese.txt
Auto-merging src/lang/thai.txt
Auto-merging src/lang/tamil.txt
Auto-merging src/lang/swedish.txt
Auto-merging src/lang/spanish_MX.txt
Auto-merging src/lang/spanish.txt
Auto-merging src/lang/slovenian.txt
Auto-merging src/lang/slovak.txt
Auto-merging src/lang/simplified_chinese.txt
Auto-merging src/lang/serbian.txt
Auto-merging src/lang/russian.txt
Auto-merging src/lang/romanian.txt
Auto-merging src/lang/portuguese.txt
Auto-merging src/lang/polish.txt
Auto-merging src/lang/norwegian_nynorsk.txt
Auto-merging src/lang/norwegian_bokmal.txt
Auto-merging src/lang/malay.txt
Auto-merging src/lang/luxembourgish.txt
Auto-merging src/lang/lithuanian.txt
Auto-merging src/lang/latvian.txt
Auto-merging src/lang/latin.txt
Auto-merging src/lang/korean.txt
Auto-merging src/lang/japanese.txt
Auto-merging src/lang/italian.txt
Auto-merging src/lang/irish.txt
Auto-merging src/lang/indonesian.txt
CONFLICT (content): Merge conflict in src/lang/indonesian.txt
Auto-merging src/lang/icelandic.txt
Auto-merging src/lang/hungarian.txt
Auto-merging src/lang/hebrew.txt
Auto-merging src/lang/greek.txt
Auto-merging src/lang/german.txt
Auto-merging src/lang/galician.txt
Auto-merging src/lang/gaelic.txt
Auto-merging src/lang/french.txt
Auto-merging src/lang/finnish.txt
Auto-merging src/lang/faroese.txt
Auto-merging src/lang/estonian.txt
Auto-merging src/lang/esperanto.txt
Auto-merging src/lang/english_US.txt
Auto-merging src/lang/english_AU.txt
Auto-merging src/lang/english.txt
Auto-merging src/lang/dutch.txt
Auto-merging src/lang/danish.txt
Auto-merging src/lang/czech.txt
Auto-merging src/lang/croatian.txt
Auto-merging src/lang/catalan.txt
Auto-merging src/lang/bulgarian.txt
Auto-merging src/lang/brazilian_portuguese.txt
CONFLICT (content): Merge conflict in src/lang/brazilian_portuguese.txt
Auto-merging src/lang/belarusian.txt
Auto-merging src/lang/basque.txt
Auto-merging src/lang/arabic_egypt.txt
Auto-merging src/lang/afrikaans.txt
Auto-merging src/ground_vehicle.cpp
Auto-merging src/engine.cpp
Auto-merging src/economy.cpp
Auto-merging src/company_gui.cpp
Auto-merging src/company_cmd.cpp
Auto-merging src/company_base.h
Auto-merging src/command.cpp
Auto-merging src/bridge_map.h
CONFLICT (content): Merge conflict in src/bridge_map.h
Auto-merging src/bridge_gui.cpp
Auto-merging src/autoreplace_gui.cpp
Auto-merging src/autoreplace_cmd.cpp
Auto-merging source.list
CONFLICT (modify/delete): projects/openttd_vs90.vcproj deleted in HEAD and modified in Feature: Add NotRoadTypes (NRT). Version Feature: Add NotRoadTypes (NRT) of projects/openttd_vs90.vcproj left in tree.
CONFLICT (modify/delete): projects/openttd_vs80.vcproj deleted in HEAD and modified in Feature: Add NotRoadTypes (NRT). Version Feature: Add NotRoadTypes (NRT) of projects/openttd_vs80.vcproj left in tree.
Auto-merging projects/openttd_vs141.vcxproj.filters
Auto-merging projects/openttd_vs141.vcxproj
Auto-merging projects/openttd_vs140.vcxproj.filters
Auto-merging projects/openttd_vs140.vcxproj
Auto-merging media/extra_grf/openttdgui.png
CONFLICT (content): Merge conflict in media/extra_grf/openttdgui.png
Auto-merging docs/landscape_grid.html
CONFLICT (content): Merge conflict in docs/landscape_grid.html
Auto-merging docs/landscape.html
CONFLICT (content): Merge conflict in docs/landscape.html
Patch failed at 0001 Feature: Add NotRoadTypes (NRT)
Use 'git am --show-current-patch' to see the failed patch

Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".