2012/12/6 Linus Torvalds <torvalds at linux-foundation.org> > > > > Trying to do manual merge of two dives results in segfault. > > Ugh. All the dives I tried that on had the dive computer information.. > > Does this trivial patch fix it for you? Yes, now it works, thanks. Sergey