You can use Visual Difference to merge differences between two revisions selected from a member history or a revision and a working file. The GUI and CLI allow you to merge differences between two revisions.