stderr:
M src/editor/ui_menus/main_menu_save_map.cc
M src/editor/ui_menus/main_menu_save_map.h
M src/ui_basic/table.cc
M src/ui_basic/table.h
M src/wui/game_main_menu_save_game.cc
M src/wui/game_main_menu_save_game.h
Text conflict in src/editor/ui_menus/main_menu_save_map.cc
1 conflicts encountered.
Error merging this proposal:
Output:
stdout:
stderr: ui_menus/ main_menu_ save_map. cc ui_menus/ main_menu_ save_map. h basic/table. cc basic/table. h game_main_ menu_save_ game.cc game_main_ menu_save_ game.h ui_menus/ main_menu_ save_map. cc
M src/editor/
M src/editor/
M src/ui_
M src/ui_
M src/wui/
M src/wui/
Text conflict in src/editor/
1 conflicts encountered.