Hello Sean,
Tuesday, October 16, 2007, 3:40:18 PM, you wrote:
> On 10/15/07 3:06 PM, Mark Wagner said:
>>I'm working on merging two branches of development. However, on one
>>branch of development, the casing of filenames and the line endings of
>>files have changed, and FileMerge can't handle it. Does anyone have
>>suggestions for a program I can use for this?
> You might try Araxis Merge.
I can second this. I use it all the time on Windows and there really
is nothing that comes close. It's now available for OS X too.
If you are regularly making comparisons between source trees, it is
worth the money.
--
Best regards,
Peter mailto:email@hidden
_______________________________________________
Do not post admin requests to the list. They will be ignored.
Xcode-users mailing list (email@hidden)
Help/Unsubscribe/Update your Subscription:
http://lists.apple.com/mailman/options/xcode-users/email@hidden
This email sent to email@hidden
