Merge two revisions of a file

[JackChristensenjackc at alamar-usa.com]

I assume what you mean, in Perforce terms, is to "resolve" the two
files.  There should be no problem in doing this.  I would guess if
you simply fire up the "p4 resolve" command and simply select the
defaults, that the job will be done correctly.

thanx,
jack c.

*****************************************************************************
Jack Christensen                Philips Digital Video Systems Company
new email:			Jack.Christensen at philipsdvs.com

	never take no cutofs and hury along as fast as you can.
					(Virginia Reed, 1847)
*****************************************************************************

On Tue, 2 Jun 1998 sheela at usrl.sony.com wrote:

> oops, sent previous mail with no subject
> >Hi,
> >
> >I have two revisions of a file..test#1, test#2. which are identical. Is it
> possible to merge the two files?
> >Thanks in advance. 
> 
> Sheela Ramakrishnan 
> Sony US Research Labs. 
> 
>