stderr:
+N data/tribes/buildings/markets/
+N data/tribes/buildings/markets/barbarians/
+N data/tribes/buildings/markets/barbarians/market/
+N data/tribes/buildings/markets/barbarians/market/build_00.png
+N data/tribes/buildings/markets/barbarians/market/helptexts.lua
+N data/tribes/buildings/markets/barbarians/market/idle_00.png
+N data/tribes/buildings/markets/barbarians/market/idle_00_pc.png
+N data/tribes/buildings/markets/barbarians/market/init.lua
+N data/tribes/buildings/markets/barbarians/market/menu.png
+N src/logic/map_objects/tribes/market.cc
+N src/logic/map_objects/tribes/market.h
+N test/maps/market_trading.wmf/
+N test/maps/market_trading.wmf/binary/
+N test/maps/market_trading.wmf/binary/heights
+N test/maps/market_trading.wmf/binary/mapobjects
+N test/maps/market_trading.wmf/binary/resource
+N test/maps/market_trading.wmf/binary/terrain
+N test/maps/market_trading.wmf/elemental
+N test/maps/market_trading.wmf/minimap.png
+N test/maps/market_trading.wmf/objective
+N test/maps/market_trading.wmf/player_names
+N test/maps/market_trading.wmf/player_position
+N test/maps/market_trading.wmf/port_spaces
+N test/maps/market_trading.wmf/scripting/
+N test/maps/market_trading.wmf/scripting/init.lua
+N test/maps/market_trading.wmf/scripting/test_market_can_be_build.lua
+N test/maps/market_trading.wmf/version
M data/tribes/barbarians.lua
M data/tribes/init.lua
M data/tribes/scripting/starting_conditions/barbarians/fortified_village.lua
M data/tribes/scripting/starting_conditions/barbarians/headquarters.lua
M data/tribes/scripting/starting_conditions/barbarians/trading_outpost.lua
M doc/sphinx/extract_rst.py
M regression_test.py
M src/logic/CMakeLists.txt
M src/logic/map_objects/map_object.cc
M src/logic/map_objects/map_object.h
M src/logic/map_objects/tribes/productionsite.cc
M src/logic/map_objects/tribes/productionsite.h
M src/logic/map_objects/tribes/tribes.cc
M src/logic/map_objects/tribes/tribes.h
M src/scripting/lua_map.cc
M src/scripting/lua_map.h
M src/scripting/lua_root.cc
M src/scripting/lua_root.h
M src/website/map_object_info.cc
M src/wui/interactive_gamebase.cc
M test/maps/lua_testsuite.wmf/scripting/tribes_descriptions.lua
Conflict adding file src/logic/map_objects/tribes/market.cc. Moved existing file to src/logic/map_objects/tribes/market.cc.moved.
Conflict adding file test/maps/market_trading.wmf. Moved existing file to test/maps/market_trading.wmf.moved.
2 conflicts encountered.
Error merging this proposal:
Output:
stdout:
stderr: buildings/ markets/ buildings/ markets/ barbarians/ buildings/ markets/ barbarians/ market/ buildings/ markets/ barbarians/ market/ build_00. png buildings/ markets/ barbarians/ market/ helptexts. lua buildings/ markets/ barbarians/ market/ idle_00. png buildings/ markets/ barbarians/ market/ idle_00_ pc.png buildings/ markets/ barbarians/ market/ init.lua buildings/ markets/ barbarians/ market/ menu.png map_objects/ tribes/ market. cc map_objects/ tribes/ market. h market_ trading. wmf/ market_ trading. wmf/binary/ market_ trading. wmf/binary/ heights market_ trading. wmf/binary/ mapobjects market_ trading. wmf/binary/ resource market_ trading. wmf/binary/ terrain market_ trading. wmf/elemental market_ trading. wmf/minimap. png market_ trading. wmf/objective market_ trading. wmf/player_ names market_ trading. wmf/player_ position market_ trading. wmf/port_ spaces market_ trading. wmf/scripting/ market_ trading. wmf/scripting/ init.lua market_ trading. wmf/scripting/ test_market_ can_be_ build.lua market_ trading. wmf/version barbarians. lua init.lua scripting/ starting_ conditions/ barbarians/ fortified_ village. lua scripting/ starting_ conditions/ barbarians/ headquarters. lua scripting/ starting_ conditions/ barbarians/ trading_ outpost. lua extract_ rst.py CMakeLists. txt map_objects/ map_object. cc map_objects/ map_object. h map_objects/ tribes/ productionsite. cc map_objects/ tribes/ productionsite. h map_objects/ tribes/ tribes. cc map_objects/ tribes/ tribes. h lua_map. cc lua_map. h lua_root. cc lua_root. h map_object_ info.cc interactive_ gamebase. cc lua_testsuite. wmf/scripting/ tribes_ descriptions. lua map_objects/ tribes/ market. cc. Moved existing file to src/logic/ map_objects/ tribes/ market. cc.moved. market_ trading. wmf. Moved existing file to test/maps/ market_ trading. wmf.moved.
+N data/tribes/
+N data/tribes/
+N data/tribes/
+N data/tribes/
+N data/tribes/
+N data/tribes/
+N data/tribes/
+N data/tribes/
+N data/tribes/
+N src/logic/
+N src/logic/
+N test/maps/
+N test/maps/
+N test/maps/
+N test/maps/
+N test/maps/
+N test/maps/
+N test/maps/
+N test/maps/
+N test/maps/
+N test/maps/
+N test/maps/
+N test/maps/
+N test/maps/
+N test/maps/
+N test/maps/
+N test/maps/
M data/tribes/
M data/tribes/
M data/tribes/
M data/tribes/
M data/tribes/
M doc/sphinx/
M regression_test.py
M src/logic/
M src/logic/
M src/logic/
M src/logic/
M src/logic/
M src/logic/
M src/logic/
M src/scripting/
M src/scripting/
M src/scripting/
M src/scripting/
M src/website/
M src/wui/
M test/maps/
Conflict adding file src/logic/
Conflict adding file test/maps/
2 conflicts encountered.