[p4] Is there way to control 'blocking' in the merge tool?

[Stephen Vance]

No, there isn't.

Steve

David Faison wrote:
> I've had some file merges where it gets uselessly out of whack.
>
> You can just eyeball the code and see where the tool has associated a
> huge segment of code from one file incorrectly, and then immediately
> below it is the huge segment of corresponding code from the other file.
>
> I'm talking like entire functions, a dozen or so lines each, that may
> have one or two edits to them, but I get no help from the tool because
> of how it completely fails to match them up to each other.
>
> David Faison
> Photon Research Associates
>
> _______________________________________________
> perforce-user mailing list  -  perforce-user at perforce.com
> http://maillist.perforce.com/mailman/listinfo/perforce-user
>
>