now using opendiff (FileMerge) instead of Araxis