stderr:
+N data/images/wui/editor/editor_menu_tool_resize.png
+N data/images/wui/editor/fsel_editor_resize.png
+N src/editor/tools/resize_tool.cc
+N src/editor/tools/resize_tool.h
+N src/editor/ui_menus/tool_resize_options_menu.cc
+N src/editor/ui_menus/tool_resize_options_menu.h
M src/editor/CMakeLists.txt
M src/editor/editorinteractive.cc
M src/editor/editorinteractive.h
M src/editor/tools/action_args.h
M src/editor/tools/history.cc
M src/editor/ui_menus/main_menu_new_map.cc
M src/editor/ui_menus/main_menu_new_map.h
M src/editor/ui_menus/main_menu_random_map.cc
M src/editor/ui_menus/main_menu_random_map.h
M src/editor/ui_menus/tool_menu.cc
M src/logic/map.cc
M src/logic/map.h
Text conflict in src/editor/ui_menus/tool_menu.cc
1 conflicts encountered.
Error merging this proposal:
Output:
stdout:
stderr: wui/editor/ editor_ menu_tool_ resize. png wui/editor/ fsel_editor_ resize. png tools/resize_ tool.cc tools/resize_ tool.h ui_menus/ tool_resize_ options_ menu.cc ui_menus/ tool_resize_ options_ menu.h CMakeLists. txt editorinteracti ve.cc editorinteracti ve.h tools/action_ args.h tools/history. cc ui_menus/ main_menu_ new_map. cc ui_menus/ main_menu_ new_map. h ui_menus/ main_menu_ random_ map.cc ui_menus/ main_menu_ random_ map.h ui_menus/ tool_menu. cc ui_menus/ tool_menu. cc
+N data/images/
+N data/images/
+N src/editor/
+N src/editor/
+N src/editor/
+N src/editor/
M src/editor/
M src/editor/
M src/editor/
M src/editor/
M src/editor/
M src/editor/
M src/editor/
M src/editor/
M src/editor/
M src/editor/
M src/logic/map.cc
M src/logic/map.h
Text conflict in src/editor/
1 conflicts encountered.