[RFC] dive merging with 0 depth

[Miika Turkia]

Should we be merging dives with zero depth? I do not see any real
reason to have the check in place, but it would not be the first time
I am missing something. Of course, it does not really make sense to
have dives with zero depth, but as the bug report is from importing,
it really makes even less sense to have a 0 depth dive multiple times
in the log.

0001 is the actual change, indentation fix is postponed to 0002 to
show the change clearly.

miika
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0002-Fix-indentation.patch
Type: text/x-diff
Size: 1292 bytes
Desc: not available
URL: <http://lists.subsurface-divelog.org/pipermail/subsurface/attachments/20160204/0aad2fda/attachment.patch>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-Allow-merging-of-dives-with-zero-depth.patch
Type: text/x-diff
Size: 958 bytes
Desc: not available
URL: <http://lists.subsurface-divelog.org/pipermail/subsurface/attachments/20160204/0aad2fda/attachment-0001.patch>