Jeffrey "botman" Broome wrote:
Chris Adams wrote:
Does anyone have any suggestions for putting these new changes into our
own code?
If you have the money to buy Araxis Merge, it does a REALLY good job of
helping you merge 2 (or 3) source code directory trees together.
You can install NXN for free (its trial or something). Its a giganteous
application, but Araxis Merge its stand-alone (i love that english word!)
and the license able to use AM forever.
You can use Winmerge, the normal GPL app,and lack some visual features,
and ...for sure some Linux merge tools are even better than Araxis MErge
And you can learn the REAL tool, diff, with cygwin or other posix layer
on NT kernel.
Beyond Compare also does a pretty good job of merging 2 source code
trees together.
Humm.. I will check that one,
Thanks BotMan.
_______________________________________________
To unsubscribe, edit your list preferences, or view the list archives, please
visit:
http://list.valvesoftware.com/mailman/listinfo/hlcoders
