On Jan 30, 2013, at 18:35, David Shea <[email protected]> wrote: > I use DiffMerge - it works especially well combined with source tree, in that > if you get a git merge conflict in there, you can open it up and get a 3 way > merge that's as good as I used to get with Araxis Merge years ago in Windows.
______________________________________________________________________ Araxis Merge is available for the Mac, but it ain't cheap. DiffMerge is free (good to know). -- Best Regards, Chris -- -- You received this message because you are subscribed to the "BBEdit Talk" discussion group on Google Groups. To post to this group, send email to [email protected] To unsubscribe from this group, send email to [email protected] For more options, visit this group at <http://groups.google.com/group/bbedit?hl=en> If you have a feature request or would like to report a problem, please email "[email protected]" rather than posting to the group. Follow @bbedit on Twitter: <http://www.twitter.com/bbedit> --- You received this message because you are subscribed to the Google Groups "BBEdit Talk" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. For more options, visit https://groups.google.com/groups/opt_out.
