dive merge seems broken in latest master

Mon Oct 15 00:06:16 PDT 2018

On Monday, 15 October 2018 08:53:16 CEST Jan Mulder wrote:

> Tried to reproduce things. As I do not have 2 DCs, I fake a second one
> just by editing the ssrf XML. I cannot reproduce it (in this way).

I can trivially reproduce this by importing a divelog onto itself. Therefore, 
this should be easy to fix. I'm heading of to lecture now and will look at 
this in the later afternoon.

Berthold