PERFORCE change 101293 for review

[John Baldwin]

On Tuesday 11 July 2006 17:03, John Baldwin wrote:
> http://perforce.freebsd.org/chv.cgi?CH=101293
> 
> Change 101293 by jhb at jhb_mutex on 2006/07/11 21:02:46
> 
> 	Attempt to fix a mismerge.
> 
> Affected files ...
> 
> .. //depot/projects/smpng/sys/bsm/audit_record.h#5 edit
> 
> Differences ...
> 
> ==== //depot/projects/smpng/sys/bsm/audit_record.h#5 (text+ko) ====
> 
> @@ -30,7 +30,7 @@
>   *
>   * @APPLE_BSD_LICENSE_HEADER_END@
>   *
> - * $P4: //depot/projects/smpng/sys/bsm/audit_record.h#4 $
> + * $P4: //depot/projects/smpng/sys/bsm/audit_record.h#5 $

p4 hates me.  I keep getting a diff relative to //depot/vendor/freebsd/...
because the CVS version has different P4 tag in it. :(

-- 
John Baldwin