added diff3 support. Allows a 3 way merge to be done, and moves any non-conflicting changes into the diff output.
version bump
fixed spec to check correct diff3 option