Skip to content
Commit d8c47260 authored by tmortagne's avatar tmortagne
Browse files

XCOMMONS-484: Silent conflict merge when diff between previous/next is not at... 

XCOMMONS-484: Silent conflict merge when diff between previous/next is not at the exact same indices than in previous/current diff

(cherry picked from commit e352487e)
parent ebaccc8c
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment