If all else fails, there's an option to set your merge tool in the [merge-tools] section of .hgrc - Chris

On Mon, Jun 30, 2008 at 12:10 PM, Tim Lahey tim.lahey@gmail.com wrote:

Hi,

I've just purchased a new computer which has enabled me to switch over to using Changes.app for my diff uses. Unfortunately, the TextMate integration assumes Subversion for version control whereas I use Mercurial.

I've made the suggested additions as mentioned on the Changes Wiki and everything works great from the command line, but the TextMate integration is failing me. I'm not familiar enough with either the Changes or the Mercurial bundle to make the changes, so I'm appealing to the TextMate community for help.

Is there some way I can either switch the Changes bundle to use Mercurial or alternatively, switch the Mercurial bundle to use chdiff and my merge script instead of just diff?

Thanks,

Tim Lahey

---

textmate mailing list textmate@lists.macromates.com http://lists.macromates.com/listinfo/textmate

On 30 Jun 2008, at 21:10, Tim Lahey wrote:

Is there some way I can either switch the Changes bundle to use Mercurial or alternatively, switch the Mercurial bundle to use chdiff and my merge script instead of just diff?

I added support for Changes (chdiff) and FileMerge (opendiff) to the bundle. It might work with other graphical diff tools, but it's untested.

Instructions to set it up are in the bundle's help.

Tell me if it works for you.

-- FredB