From mboxrd@z Thu Jan  1 00:00:00 1970
X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on polar.synack.me
X-Spam-Level: 
X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM
	autolearn=ham autolearn_force=no version=3.4.4
X-Google-Thread: 103376,e3649276d0ec8d18,start
X-Google-Attributes: gid103376,public,usenet
X-Google-Language: ENGLISH,ASCII-7-bit
Path: 
 g2news2.google.com!postnews.google.com!r29g2000hsg.googlegroups.com!not-for-mail
From: prichtmyer@yahoo.com
Newsgroups: comp.lang.ada
Subject: Merging Ada Files
Date: Tue, 11 Sep 2007 19:00:48 -0700
Organization: http://groups.google.com
Message-ID: <1189562448.148837.261350@r29g2000hsg.googlegroups.com>
NNTP-Posting-Host: 132.228.195.206
Mime-Version: 1.0
Content-Type: text/plain; charset="iso-8859-1"
X-Trace: posting.google.com 1189562448 6020 127.0.0.1 (12 Sep 2007 02:00:48
 GMT)
X-Complaints-To: groups-abuse@google.com
NNTP-Posting-Date: Wed, 12 Sep 2007 02:00:48 +0000 (UTC)
User-Agent: G2/1.0
X-HTTP-UserAgent: Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1;
 .NET CLR 1.1.4322; .NET CLR 2.0.50727; InfoPath.1),gzip(gfe),gzip(gfe)
Complaints-To: groups-abuse@google.com
Injection-Info: r29g2000hsg.googlegroups.com; posting-host=132.228.195.206;
   posting-account=ps2QrAMAAAA6_jCuRt2JEIpn5Otqf_w0
Xref: g2news2.google.com comp.lang.ada:1898
Date: 2007-09-11T19:00:48-07:00
List-Id: <comp.lang.ada>

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.