Launching the diff tool in version 4.7.2 crashes on exit, regardless of the presence of conflicts. By the way, before crashing, the tool does indeed produce a new version of the blueprint (I checked and the MD5 hashes differ). However opening the blueprint in the editor reveals that the contents are the same as the “local” file. In other words, no merge had been performed at all. It’s apparent that the feature is not ready for prime time. Please, do not rush it… take your time but make it work. We really need it!