Never liked the clunky BeyondCompare - Araxis Merge is pricy but wins hands
down.
Here is one of my own take on making a diff-compare tool. Never really
finished it into a full commercial standalone product, hesitant seeing that
there are already heaps of free or cheap diff-tools out on the
That one looks pretty cool.its not really a standalone program is it?
;) I would use it if it were. I remember many years ago that there were
diff tools on unix that I imagine must have been made into graphical tools
by now.there were diff and diff3 tools that could generate editor
We use Araxis Merge for two way diff's and Tortoise Merge for 3 way
merges.
We found that Tortoise Merge automatically handles the merges much
better than Araxis Merge, but Tortoise Merge is annoying when editing
conflicts. You can't edit the text. You can only pick which lines you
want to keep.
Araxis rules for 2 3 way merge/diffs.
Myles.
-Original Message-
From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED]
On Behalf Of Stacey Verner
Sent: Friday, 12 October 2007 08:21
To: NZ Borland Developers Group - Delphi List
Subject: RE: [DUG] Source Control - Sharing files between
I have a PostgreSQL database holding two tables Drawings and Devices.
Each of the drawings holds devices numbering between 0 - 100.
I also have a Delphi interface with which a user can select a device, the
application then performs a procedure then updates the Devices table with an
interface
Hey guys,
Can anyone recommend a good encryption component?
Cheers
Al
-Original Message-
From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED] On
Behalf Of Alister Christie
Sent: Thursday,11 October,2007 3:27 PM
To: NZ Borland Developers Group - Delphi List
Subject: Re: [DUG]
