Branch: refs/heads/master Home: https://github.com/xwiki/xwiki-platform Commit: 821d43ec45e67d45a6735a0717b9b77fffc1cd9f https://github.com/xwiki/xwiki-platform/commit/821d43ec45e67d45a6735a0717b9b... Author: pjeanjean <pierre.jeanjean@xwiki.com> Date: 2024-03-21 (Thu, 21 Mar 2024) Changed paths: M xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-test/xwiki-platform-flamingo-skin-test-docker/src/test/it/org/xwiki/flamingo/test/docker/EditIT.java M xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/diff_macros.vm Log Message: ----------- XWIKI-21626: Improve escaping during conflict resolution To unsubscribe from these emails, change your notification settings at https://github.com/xwiki/xwiki-platform/settings/notifications