00000 ?

root@gitlab:/devel/LogicmooDeveloperFramework/swipl-devel# git pull upstream master
From https://github.com/SWI-Prolog/swipl-devel
 * branch            master     -> FETCH_HEAD
warning: Failed to merge submodule packages/xpce (commits not present)
Auto-merging packages/xpce
CONFLICT (submodule): Merge conflict in packages/xpce
Automatic merge failed; fix conflicts and then commit the result.
root@gitlab:/devel/LogicmooDeveloperFramework/swipl-devel# git diff
diff --cc packages/xpce
index 2f4450e,835238f..0000000
--- a/packages/xpce
+++ b/packages/xpce
diff --git a/packages/nlp b/packages/nlp
--- a/packages/nlp
+++ b/packages/nlp
@@ -1 +1 @@
-Subproject commit b4184ac44fca2ef78812ce3ecac5c32b026ee627
+Subproject commit b4184ac44fca2ef78812ce3ecac5c32b026ee627-dirty
diff --git a/packages/ssl b/packages/ssl
--- a/packages/ssl
+++ b/packages/ssl
@@ -1 +1 @@
-Subproject commit ded932e0742329602f1ce8e9a3a21e74b8f20607
+Subproject commit ded932e0742329602f1ce8e9a3a21e74b8f20607-dirty
root@gitlab:/devel/LogicmooDeveloperFramework/swipl-devel#