[SVN] r2886 (Subversion)
Chris Thomas
chris at cjack.com
Wed Mar 22 17:59:27 UTC 2006
Add some rudimentary macros to help with conflict resolution
Changed:
A trunk/Bundles/Subversion.tmbundle/Macros/
A trunk/Bundles/Subversion.tmbundle/Macros/Find Next Conflict.plist
A trunk/Bundles/Subversion.tmbundle/Macros/Replace Conflict With Newer Text.plist
A trunk/Bundles/Subversion.tmbundle/Macros/Replace Conflict With Older Text.plist
U trunk/Bundles/Subversion.tmbundle/info.plist
More information about the textmate-dev
mailing list