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.
--
____________________________________________________________
Sean McBride, B. Eng email@hidden
Rogue Research www.rogue-research.com
Mac Software Developer Montréal, Québec, Canada
_______________________________________________
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
