Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- $ git pull https://github.com/kaadmy/minetest 'shading'
- remote: Counting objects: 355, done.
- remote: Total 355 (delta 206), reused 206 (delta 206), pack-reused 149
- Receiving objects: 100% (355/355), 133.33 KiB | 0 bytes/s, done.
- Resolving deltas: 100% (287/287), completed with 73 local objects.
- From https://github.com/kaadmy/minetest
- * branch shading -> FETCH_HEAD
- Auto-merging src/wieldmesh.cpp
- Auto-merging src/script/common/c_content.cpp
- Auto-merging src/nodedef.cpp
- Auto-merging src/mesh.h
- Auto-merging src/mesh.cpp
- Auto-merging src/mapblock_mesh.cpp
- CONFLICT (content): Merge conflict in src/mapblock_mesh.cpp
- Auto-merging src/game.cpp
- CONFLICT (content): Merge conflict in src/game.cpp
- Auto-merging src/defaultsettings.cpp
- Auto-merging src/content_mapblock.cpp
- CONFLICT (content): Merge conflict in src/content_mapblock.cpp
- Auto-merging src/content_cao.h
- Auto-merging src/content_cao.cpp
- CONFLICT (content): Merge conflict in src/content_cao.cpp
- Auto-merging src/clientenvironment.cpp
- Auto-merging src/camera.h
- Auto-merging src/camera.cpp
- CONFLICT (content): Merge conflict in src/camera.cpp
- Auto-merging minetest.conf.example
- Auto-merging builtin/settingtypes.txt
- Auto-merging builtin/mainmenu/tab_settings.lua
- CONFLICT (content): Merge conflict in builtin/mainmenu/tab_settings.lua
- Automatic merge failed; fix conflicts and then commit the result.
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement