From: Per Sandberg <per.sandberg@bredband.net>
Subject: Re: Merging Ada Files
Date: Wed, 12 Sep 2007 06:01:17 +0200
Date: 2007-09-12T06:01:17+02:00 [thread overview]
Message-ID: <wvJFi.34134$Nc.6245@newsfet01.ams> (raw)
In-Reply-To: <1189562448.148837.261350@r29g2000hsg.googlegroups.com>
Two merge tools i find resonable are:
http://winmerge.org/ (Windows only)
http://kdiff3.sourceforge.net/ (Windows and Linux)
/Per
prichtmyer@yahoo.com wrote:
> We have two versions of an Ada system, both derived/evolved from an
> older version. For each Ada file where there are differences in the 2
> versions, I would like to make a complete file merge where the output
> file identifies (somehow) those lines of code that were only in
> version A (if any), and those lines that were only in version B (if
> any), as well as possible conflicts. Does anyone know of a tool or way
> to accomplish this? Platform can be either MS Windows or Sun - Unix.
> Thanks.
>
next prev parent reply other threads:[~2007-09-12 4:01 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-09-12 2:00 Merging Ada Files prichtmyer
2007-09-12 4:01 ` Per Sandberg [this message]
2007-09-12 8:07 ` Tomek Wa kuski
2007-09-12 12:33 ` Stephen Leake
2007-09-12 20:56 ` Simon Wright
2007-09-13 3:48 ` Steve
replies disabled
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox