[p4] Issue with edit on integrate

[Robert Cowham]

Following up - just to show the diff -sb at work:

C:\bruno_ws\main\jam>p4 info
Server version: P4D/NTX86/2006.2/112639 (2006/12/14)

C:\bruno_ws\main\jam>p4 integ jam.c m1
//depot/main/jam/m1#1 - branch/sync from //depot/main/jam/jam.c#1,#35

C:\bruno_ws\main\jam>fc jam.c m1
Comparing files jam.c and M1
FC: no differences encountered

C:\bruno_ws\main\jam>attrib -r m1

C:\bruno_ws\main\jam>notepad m1

C:\bruno_ws\main\jam>fc jam.c m1
Comparing files jam.c and M1
***** jam.c
/*
 * /+\
 * +\   Copyright 1993, 1996 Christopher Seiwald.
***** M1
/*
asfdasfd * /+\
 * +\   Copyright 1993, 1996 Christopher Seiwald.
*****

C:\bruno_ws\main\jam>p4 diff -sb ...
c:\bruno_ws\main\jam\m1