Add 'resolve conflicts with FileMerge' Changed: A trunk/Bundles/Subversion.tmbundle/Commands/Resolve Conflicts With FileMerge….tmCommand U trunk/Bundles/Subversion.tmbundle/info.plist