• Open Menu Close Menu
  • Apple
  • Shopping Bag
  • Apple
  • Mac
  • iPad
  • iPhone
  • Watch
  • TV
  • Music
  • Support
  • Search apple.com
  • Shopping Bag

Lists

Open Menu Close Menu
  • Terms and Conditions
  • Lists hosted on this site
  • Email the Postmaster
  • Tips for posting to public mailing lists
Re: Three-way merge program
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Three-way merge program


  • Subject: Re: Three-way merge program
  • From: "Sean McBride" <email@hidden>
  • Date: Tue, 16 Oct 2007 10:40:18 -0400
  • Organization: Rogue Research

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:

This email sent to email@hidden

  • Follow-Ups:
    • Re[2]: Three-way merge program
      • From: Peter Mulholland <email@hidden>
References: 
 >Three-way merge program (From: "Mark Wagner" <email@hidden>)

  • Prev by Date: malloc - double free problem on Leopard
  • Next by Date: Re: malloc - double free problem on Leopard
  • Previous by thread: Re: Three-way merge program
  • Next by thread: Re[2]: Three-way merge program
  • Index(es):
    • Date
    • Thread