d:\github\harbour34>git pull
https://github.com/harbour/core
From
https://github.com/harbour/core
* branch HEAD -> FETCH_HEAD
Auto-merging utils/hbtest/hbtest.prg
CONFLICT (content): Merge conflict in utils/hbtest/hbtest.prg
Auto-merging utils/hbmk2/hbmk2.prg
CONFLICT (content): Merge conflict in utils/hbmk2/hbmk2.prg
Auto-merging utils/hbi18n/hbi18n.prg
CONFLICT (content): Merge conflict in utils/hbi18n/hbi18n.prg
Auto-merging tests/html.prg
CONFLICT (content): Merge conflict in tests/html.prg
Auto-merging src/vm/memvars.c
Auto-merging src/vm/itemapi.c
Auto-merging src/rtl/hbdef.c
CONFLICT (content): Merge conflict in src/rtl/hbdef.c
Auto-merging src/rtl/dirscan.prg
Auto-merging src/pp/hbpp.c
CONFLICT (content): Merge conflict in src/pp/hbpp.c
Auto-merging src/main/harbour.rc
CONFLICT (add/add): Merge conflict in src/main/harbour.rc
Auto-merging src/harbour.def
CONFLICT (content): Merge conflict in src/harbour.def
Auto-merging src/debug/dbgwa.prg
Auto-merging src/compiler/hbusage.c
CONFLICT (content): Merge conflict in src/compiler/hbusage.c
Auto-merging src/compiler/complex.c
CONFLICT (content): Merge conflict in src/compiler/complex.c
Auto-merging src/common/hbver.c
CONFLICT (content): Merge conflict in src/common/hbver.c
Auto-merging src/3rd/zlib/ChangeLog.txt
CONFLICT (content): Merge conflict in src/3rd/zlib/ChangeLog.txt
CONFLICT (modify/delete): package/winuni/mpkg_win_uni.nsi deleted in HEAD and modified in 19c4c58b3d06d1f32a92fb0c8a28d3ca0e858307. Version 19c4c58b3d06d1f32a92fb0c8a28d3ca0e858307 of package/winuni/mpkg_win_uni.nsi left in tree.
CONFLICT (modify/delete): package/mpkg_win.nsi deleted in HEAD and modified in 19c4c58b3d06d1f32a92fb0c8a28d3ca0e858307. Version 19c4c58b3d06d1f32a92fb0c8a28d3ca0e858307 of package/mpkg_win.nsi left in tree.
Auto-merging package/harbour.spec
CONFLICT (content): Merge conflict in package/harbour.spec
Auto-merging package/harbour.rc
CONFLICT (content): Merge conflict in package/harbour.rc
CONFLICT (modify/delete): package/harbour.rb deleted in HEAD and modified in 19c4c58b3d06d1f32a92fb0c8a28d3ca0e858307. Version 19c4c58b3d06d1f32a92fb0c8a28d3ca0e858307 of package/harbour.rb left in tree.
CONFLICT (modify/delete): package/harbour.mft deleted in HEAD and modified in 19c4c58b3d06d1f32a92fb0c8a28d3ca0e858307. Version 19c4c58b3d06d1f32a92fb0c8a28d3ca0e858307 of package/harbour.mft left in tree.
Auto-merging package/harbour-win.spec.in
CONFLICT (content): Merge conflict in package/harbour-win.spec.in
Auto-merging package/harbour-wce.spec.in
CONFLICT (content): Merge conflict in package/harbour-wce.spec.in
Auto-merging include/harbour.hbx
CONFLICT (content): Merge conflict in include/harbour.hbx
Auto-merging contrib/sddodbc/core.c
Auto-merging contrib/hbzebra/tests/wingdi.prg
CONFLICT (content): Merge conflict in contrib/hbzebra/tests/wingdi.prg
Auto-merging contrib/hbzebra/tests/harupdf.prg
CONFLICT (content): Merge conflict in contrib/hbzebra/tests/harupdf.prg
Auto-merging contrib/hbzebra/tests/cairo.prg
CONFLICT (content): Merge conflict in contrib/hbzebra/tests/cairo.prg
Auto-merging contrib/hbwin/tests/ole.prg
CONFLICT (content): Merge conflict in contrib/hbwin/tests/ole.prg
Auto-merging contrib/hbnetio/utils/hbnetio/hbnetio.prg
CONFLICT (content): Merge conflict in contrib/hbnetio/utils/hbnetio/hbnetio.prg
Auto-merging contrib/hbformat/utils/hbformat.prg
CONFLICT (content): Merge conflict in contrib/hbformat/utils/hbformat.prg
Auto-merging contrib/hbdoc/hbdoc.prg
CONFLICT (content): Merge conflict in contrib/hbdoc/hbdoc.prg
CONFLICT (modify/delete): contrib/gtwvw/doc/gtwvw.txt deleted in HEAD and modified in 19c4c58b3d06d1f32a92fb0c8a28d3ca0e858307. Version 19c4c58b3d06d1f32a92fb0c8a28d3ca0e858307 of contrib/gtwvw/doc/gtwvw.txt left in tree.
Auto-merging config/global.mk
CONFLICT (content): Merge conflict in config/global.mk
Auto-merging README.md
CONFLICT (content): Merge conflict in README.md
Auto-merging ChangeLog.txt
CONFLICT (content): Merge conflict in ChangeLog.txt
Automatic merge failed; fix conflicts and then commit the result.