Re: Integrating Versions with DiffMerge for 3 way merges

2011-11-28 Thread Chris Ozeroff
Black Pixel On 2011-11-27, at 11:10 PM, Chris Ozeroff wrote: Hey everyone, For those of you interested in custom scripts for Versions, I created a simple app to make it easier to launch a 3-way merge in DiffMerge from Versions. See my blog post here: http://chrisnchris.wordpress.com

Integrating Versions with DiffMerge for 3 way merges

2011-11-27 Thread Chris Ozeroff
Hey everyone, For those of you interested in custom scripts for Versions, I created a simple app to make it easier to launch a 3-way merge in DiffMerge from Versions. See my blog post here: http://chrisnchris.wordpress.com/2011/11/22/3-way-merging-using-versions-and-diffmerge/ And to Black