https://github.com/xwiki/xwiki-commons
Revision 34f1f1bcf4ccd267760f6ab5bc3dcc34ff17d751 authored by Simon Urli on 09 August 2019, 09:33:32 UTC, committed by Simon Urli on 09 August 2019, 09:35:27 UTC
  * Check the index to get the next patch elements: skip some elements
if it's before the fallback position
  * Add some more tests
1 parent 669921b
History
Tip revision: 34f1f1bcf4ccd267760f6ab5bc3dcc34ff17d751 authored by Simon Urli on 09 August 2019, 09:33:32 UTC
XCOMMONS-1700: merge: conflict reporting might be wrong in case of multiple conflicts and fallback config
Tip revision: 34f1f1b
File Mode Size
xwiki-commons-core
xwiki-commons-pom
xwiki-commons-tools
.gitattributes -rw-r--r-- 155 bytes
.gitignore -rw-r--r-- 392 bytes
Jenkinsfile -rw-r--r-- 3.8 KB
LICENSE -rw-r--r-- 25.8 KB
README.md -rw-r--r-- 1.7 KB
build.gradle -rw-r--r-- 1.7 KB
pom.xml -rw-r--r-- 104.6 KB
settings.gradle -rw-r--r-- 2.0 KB

README.md

back to top