On 10/16/07, Mark Wagner <email@hidden> wrote:
> 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?
The line endings you can fix with a shell script that you set up
FileMerge to call for you. I have a script in ~/Unix/bin/uncr that
looks like this:
#!/bin/sh
perl -p -e 's/\r\n?/\n/g'
Create that, then in FileMerge's preferences, pick Filters and add an
entry for the filetype you want to filter. The Filter section should
look like this:
$(HOME)/Unix/bin/uncr $(FILE)
Display should be Filtered, and Apply should be Yes.
--
// jack
// http://www.nuthole.com
_______________________________________________
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
