Re: Integrating Versions with DiffMerge for 3 way merges

2011-11-28 Thread Rick Fillion
Hi Chris, Great post, I'm sure that'll help out a lot of people. I'm currently the lead dev on Versions, so I figured I'd take a crack at answering the question of Why doesn't Black Pixel already have this in there? The easy answer: we (Black Pixel) haven't done a release yet since getting

Re: Integrating Versions with DiffMerge for 3 way merges

2011-11-28 Thread Chris Ozeroff
Thanks, Rick! It is true that having two drop-downs would be a little ugly, and perhaps not in the Mac idiom of minimalist GUI design. However, I think that would actually be the best short-term idea. 1. Some developers I know (few of them, admittedly) actually prefer different tools for diffs