added filemerge script for use on OS X through terminal