• set encoding (via __CF_USER_TEXT_ENCODING) to utf-8 before calling opendiff — it still gives a non-ASCII warning, but it does make utf-8 files show correctly Changed: U trunk/Bundles/Diff.tmbundle/Commands/Merge Selected Files.plist