Three-way merge program

• Subject: Three-way merge program
• From: "Mark Wagner" <email@hidden>
• Date: Mon, 15 Oct 2007 15:06:40 -0700
• Delivered-to: email@hidden
• Delivered-to: email@hidden
• Dkim-signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=beta; h=domainkey-signature:received:received:message-id:date:from:to:subject:mime-version:content-type:content-transfer-encoding:content-disposition; bh=o0S89RRoKssRviAw6Fbe52IsYs6iaowj3taUF8Xdq9Y=; b=MNCgC+wsRSwaqW9PkJ0w6qAJTOgOrkLsBpJoRjY+yvg/3fAlX3L82rflhVpQEy6lq9XGueave27EUCA48rHTGfvwQDeFNGnbSgR6KBUf0QTqrU4EPUXQ8xtv8wYVvMGDZBPyCR4hDf531Zp5KIiPKsWVapHv1bB8eoLYFBj5iJI=
• Domainkey-signature: a=rsa-sha1; c=nofws; d=gmail.com; s=beta; h=received:message-id:date:from:to:subject:mime-version:content-type:content-transfer-encoding:content-disposition; b=op/QxQUkc0YWhxVgWXa4YzaSngN+88+EHwGICB/UtynOsrafMMJCpIjL276SvnLdCvJ0WG0HemaDuRPnQZG8EP28pbHFh5bfuip2efa8MwUCnTXBYD35ivZZMz4sMkBqQPo8wXtL3WIV0eJMUA6wmBxiKaMGxb1QYG5W5EvFc4c=

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?

Thanks,
Mark Wagner
 _______________________________________________
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

• Follow-Ups:
  • Re: Three-way merge program
    • From: "Sean McBride" <email@hidden>
  • Re: Three-way merge program
    • From: "Jack Nutting" <email@hidden>

• Prev by Date: GDB handing when step into
• Next by Date: Re: Re[2]: GCC 3.3 template compile error?
• Previous by thread: Re: GDB handing when step into
• Next by thread: Re: Three-way merge program
• Index(es):
  • Date
  • Thread