Either you have to print out the conflicts along with the parent or jump
between them in Notes, to check which one you need to keep and which one to
discard. Well, no more!
There is an undocumented DLL-file supplied with Notes that will do this for
you. Just add this to your notes.ini file:
You'll get an additional menu option under Actions called Difference of 2
documents. This neat feature will display all fields that differ and their
respectively content in an dialog box for review.
Of course, since it's undocumented, don't bet on it always being available
in future versions or it's behavior remaining constant. It is still there in