ndavis added a comment.
Ok, I see what the issue was. The conflicts are literally stored *in* the file that has the conflict as text, so `dialog-input-devices.svg` was turned into a diff of the old and new versions. REPOSITORY R266 Breeze Icons REVISION DETAIL https://phabricator.kde.org/D16951 To: ndavis, #vdg, ngraham, nicolasfella, #kde_connect Cc: cfeck, trickyricky26, abetts, ngraham, rizzitello, nicolasfella, kde-frameworks-devel, michaelh, bruns
