I wrote up some directions with screenshots on how to use Filemerge
here:
http://daveyshafik.com/archives/681-resolving-svn-conflicts-with-filemergeapp-on-os-x.html
- Davey
On Aug 13, 2009, at 06:11 PM, Appfire wrote:
I am trying to understand how can I use filemerge to resolve conflicts
Hi!
The number 1 feature that's lacking, well, at least from our
perspective here, is the following :
When you update a project and have directory properties conflict
(e.g : happens especially when you have lots of plugins used as
externals), version doesn't have any form of notice for that.
I
