[p4] Merging without resolve?

Matthew Vegh Matthew.Vegh at EMBARCADERO.COM
Thu Oct 13 10:14:25 PDT 2005


Given a file with a number of linear revisions, is it possible to open a
P4WinMerge dialog with 2 historical revisions? If so, how?

 

Example: MyClass.java#6 introduced changes that are no longer wanted.
MyClass.java#12 is the head revision. Can I open MyClass.java#12 for
edit and bring up a 3-way merge showing panes with #6, #8 and the
prospective merged version?

 

Thanks,

Matt

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://maillist.perforce.com/pipermail/perforce-user/attachments/20051013/0ea1529f/attachment-0006.html>


More information about the perforce-user mailing list