When performing a merge of documents, the special of merging two documents with the same inserted attachments might lead to an NPE.
Apparently we decided to warn users in such cases, but we don't give the right reference in case of inserted document.
Note that this is actually an old issue that I tracked back there: https://github.com/xwiki/xwiki-platform/commit/12e01aa1e383beb131df42265eef2af15ac0b08e#diff-9c8228109f081a40ad73bfd95c485902R8463 but it's now more used than before since this code is called as part of the Merge on save mechanism implemented in
- relates to
XWIKI-9120 Extension Manager shouldn't add new versions of attachments when no changes have been made to the document
XWIKI-16464 Merge conflict: allow choice by chunks and custom fixes