Any hope for a 3-way merge feature in BBEdit? The existing 2-way diff support is wonderful, but it doesn't appear to be sufficient to resolve merge conflicts, e.g. in git.
Saving that, any recommendations for a 3rd party 3-way merge program? I find Apple's FileMerge frustrating it does not allow editing and does not show the final merged document (though maybe I'm missing something). I checked out Kaleidoscope briefly, and it seems better than FileMerge, but it does not support editing. -- -- 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.
