Code review comment for lp:~chr0x07/inkscape/0.92.fixes.2

Could you maybe just "bzr revert CMakeScripts/InstallMSYS2.cmake"?

I guess this has to do with Bazaar storing something like an inode number for each file, so even if a file has the same content it will show as a conflict (stupid, but that's just the way bzr is ;-) )

I recently had to explicitly delete and recreate that file as it was impossible to merge changes from trunk otherwise (bzr insisted it were different files, even when the content was identical, because they were created "individually" after branching 0.92.x)