• new command to diff buffer with the version on disk • added key equivalent to merge command Changed: A trunk/Bundles/Diff.tmbundle/Commands/Diff With File on Disk.plist U trunk/Bundles/Diff.tmbundle/Commands/Merge Selected Files.plist U trunk/Bundles/Diff.tmbundle/info.plist