[TxMt] Re: TM2 - Subversion - Replace Conflict With Older/Newer Text

[Allan Odgaard]

On 28 Jul 2014, at 22:43, Quinn Comendant wrote:

> So it's been a few months since this issue came up, and I think I 
> never used the Subversion merge commands since discussing it with you, 
> but today I noticed they still don't work. You mention you fixed the 
> macro replay code, and I think I'm running the latest version (under 
> Preferences > Bundles > Subversion it says "Updated: Last month"). Is 
> there a function to reload a bundle to the pristine state, so I can be 
> sure I've got the correctly working copy?

Check if you have ~/Library/Application 
Support/Avian/Bundles/Subversion.tmbundle and possibly delete it (to 
remove local changes for that bundle).

To revert everything see 
https://github.com/textmate/textmate/wiki/Reverting-To-Defaults