adding bin/ediff3 (script for doing a 3 way merge via emacs)