X-MimeOLE: Produced By Microsoft Exchange V6.5
Received: by onstor-exch02.onstor.net 
	id <01C7C8CF.2ED07981@onstor-exch02.onstor.net>; Tue, 17 Jul 2007 16:04:17 -0800
MIME-Version: 1.0
Content-Type: multipart/alternative;
	boundary="----_=_NextPart_001_01C7C8CF.2ED07981"
Content-class: urn:content-classes:message
Subject: Using p4v's merge/diff tool with command line p4 diff
Date: Tue, 17 Jul 2007 16:04:17 -0800
Message-ID: <BB375AF679D4A34E9CA8DFA650E2B04E022158EA@onstor-exch02.onstor.net>
X-MS-Has-Attach: 
X-MS-TNEF-Correlator: 
Thread-Topic: Using p4v's merge/diff tool with command line p4 diff
Thread-Index: AcfIzy78tbRQUFGwRv6NuQ+nuZguJg==
From: "Larry Scheer" <larry.scheer@onstor.com>
To: "Tim Gardner" <tim.gardner@onstor.com>,
	"Andy Sharp" <andy.sharp@onstor.com>

This is a multi-part message in MIME format.

------_=_NextPart_001_01C7C8CF.2ED07981
Content-Type: text/plain;
	charset="utf-8"
Content-Transfer-Encoding: base64

SSB3YXMgdHJ5aW5nIHRvIGZpZ3VyZSBvdXQgaG93IHRvIHVzZSBwNHbigJlzIGRpZmYvbWVyZ2Ug
dXRpbGl0eSBhcyBteSB2aXN1YWwgZGlmZiB0b29sLg0KDQpZb3UgZ3V5cyBhcmUgcHJvYmFibHkg
aGFwcHkgd2l0aCB5b3VyIGRpZmYgYW5kIG1lcmdlIHRvb2xzLCBidXQgaW4gY2FzZSBhbnlvbmUg
YXNrcyB5b3UgaG93IHRvIGRvIHRoaXMgaGVyZSBpcyB0aGUgYW5zd2VyOg0KDQpCYXNoOg0KZXhw
b3J0IFA0RElGRj0ncDR2IC1tZXJnZScNCg0KYy1zaGVsbDoNCnNldGVudiBQNERJRkYg4oCYcDR2
IOKAk21lcmdl4oCZDQoNCklmIHlvdSB3YW50IHRvIHVzZSBwNHYgYXMgeW91ciBtZXJnZSB0b29s
IHVzZToNCg0KQmFzaDoNCmV4cG9ydCBQNE1FUkdFPSdwNHYgLW1lcmdlJw0KDQpjLXNoZWxsOg0K
c2V0ZW52IFA0TUVSR0Ug4oCYcDR2IOKAk21lcmdl4oCZDQoNClZlcnNpb25zIG9mIHA0diByZWxl
YXNlZCBwcmlvciB0byAyMDA2IGtpbmRhIHN1Y2sgc28gaXQgcGF5cyB0byBydW4gdGhlIGxhdGVz
dCB2ZXJzaW9uLg0KDQpUaGUgbGF0ZXN0IHZlcnNpb24gb2YgIHA0djoNCg0K77u/IO+7v1Jldi4g
UGVyZm9yY2UgVmlzdWFsIENsaWVudC9MSU5VWDI2WDg2LzIwMDcuMi8xMjgxNjYNCg0KQW5kIHll
cywgSSBwdXQgdGhpcyBpbiBhIHdpa2kgcGFnZSBpbiB0aGUgcGVyZm9yY2Ugc2VjdGlvbiBvZiB1
c2VmdWwgaW5mb3JtYXRpb24uDQo=

------_=_NextPart_001_01C7C8CF.2ED07981
Content-Type: text/html;
	charset="utf-8"
Content-Transfer-Encoding: base64

PCFET0NUWVBFIEhUTUwgUFVCTElDICItLy9XM0MvL0RURCBIVE1MIDMuMi8vRU4iPg0KPEhUTUw+
DQo8SEVBRD4NCjxNRVRBIEhUVFAtRVFVSVY9IkNvbnRlbnQtVHlwZSIgQ09OVEVOVD0idGV4dC9o
dG1sOyBjaGFyc2V0PXV0Zi04Ij4NCjxNRVRBIE5BTUU9IkdlbmVyYXRvciIgQ09OVEVOVD0iTVMg
RXhjaGFuZ2UgU2VydmVyIHZlcnNpb24gNi41Ljc2NTIuMjQiPg0KPFRJVExFPlVzaW5nIHA0didz
IG1lcmdlL2RpZmYgdG9vbCB3aXRoIGNvbW1hbmQgbGluZSBwNCBkaWZmPC9USVRMRT4NCjwvSEVB
RD4NCjxCT0RZPg0KPCEtLSBDb252ZXJ0ZWQgZnJvbSB0ZXh0L3J0ZiBmb3JtYXQgLS0+DQoNCjxQ
IEFMSUdOPUxFRlQ+PFNQQU4gTEFORz0iZW4tdXMiPjxGT05UIFNJWkU9MiBGQUNFPSJBcmlhbCI+
SSB3YXMgdHJ5aW5nIHRvIGZpZ3VyZSBvdXQgaG93IHRvIHVzZSBwNHY8L0ZPTlQ+PC9TUEFOPjxT
UEFOIExBTkc9ImVuLXVzIj48L1NQQU4+PFNQQU4gTEFORz0iZW4tdXMiPjxGT05UIFNJWkU9MiBG
QUNFPSJBcmlhbCI+4oCZPC9GT05UPjwvU1BBTj48U1BBTiBMQU5HPSJlbi11cyI+PC9TUEFOPjxT
UEFOIExBTkc9ImVuLXVzIj48Rk9OVCBTSVpFPTIgRkFDRT0iQXJpYWwiPnMgZGlmZi9tZXJnZSB1
dGlsaXR5IGFzIG15IHZpc3VhbCBkaWZmIHRvb2wuPC9GT05UPjwvU1BBTj48U1BBTiBMQU5HPSJl
bi11cyI+PC9TUEFOPjxTUEFOIExBTkc9ImVuLXVzIj48L1NQQU4+PC9QPg0KDQo8UCBBTElHTj1M
RUZUPjxTUEFOIExBTkc9ImVuLXVzIj48Rk9OVCBTSVpFPTIgRkFDRT0iQXJpYWwiPllvdSBndXlz
IGFyZSBwcm9iYWJseSBoYXBweSB3aXRoPC9GT05UPjwvU1BBTj48U1BBTiBMQU5HPSJlbi11cyI+
PC9TUEFOPjxTUEFOIExBTkc9ImVuLXVzIj4gPEZPTlQgU0laRT0yIEZBQ0U9IkFyaWFsIj55b3Vy
IGRpZmYgYW5kIG1lcmdlIHRvb2xzLCBidXQgaW4gY2FzZSBhbnlvbmUgYXNrcyB5b3UgaG93IHRv
IGRvIHRoaXMgaGVyZSBpcyB0aGUgYW5zd2VyOjwvRk9OVD48L1NQQU4+PFNQQU4gTEFORz0iZW4t
dXMiPjwvU1BBTj48U1BBTiBMQU5HPSJlbi11cyI+PC9TUEFOPjwvUD4NCg0KPFAgQUxJR049TEVG
VD48U1BBTiBMQU5HPSJlbi11cyI+PEZPTlQgU0laRT0yIEZBQ0U9IkFyaWFsIj5CYXNoOjwvRk9O
VD48L1NQQU4+PFNQQU4gTEFORz0iZW4tdXMiPjwvU1BBTj48U1BBTiBMQU5HPSJlbi11cyI+PC9T
UEFOPjwvUD4NCg0KPFAgQUxJR049TEVGVD48U1BBTiBMQU5HPSJlbi11cyI+PEZPTlQgU0laRT0y
IEZBQ0U9IkFyaWFsIj5leHBvcnQ8L0ZPTlQ+PC9TUEFOPjxTUEFOIExBTkc9ImVuLXVzIj48L1NQ
QU4+PFNQQU4gTEFORz0iZW4tdXMiPiA8Rk9OVCBTSVpFPTIgRkFDRT0iQXJpYWwiPlA0RElGRj0n
cDR2IC1tZXJnZSc8L0ZPTlQ+PC9TUEFOPjxTUEFOIExBTkc9ImVuLXVzIj48L1NQQU4+PFNQQU4g
TEFORz0iZW4tdXMiPjwvU1BBTj48L1A+DQoNCjxQIEFMSUdOPUxFRlQ+PFNQQU4gTEFORz0iZW4t
dXMiPjxGT05UIFNJWkU9MiBGQUNFPSJBcmlhbCI+Yy1zaGVsbDo8L0ZPTlQ+PC9TUEFOPjxTUEFO
IExBTkc9ImVuLXVzIj48L1NQQU4+PFNQQU4gTEFORz0iZW4tdXMiPjwvU1BBTj48L1A+DQoNCjxQ
IEFMSUdOPUxFRlQ+PFNQQU4gTEFORz0iZW4tdXMiPjxGT05UIFNJWkU9MiBGQUNFPSJBcmlhbCI+
c2V0ZW52IFA0RElGRjwvRk9OVD48L1NQQU4+PFNQQU4gTEFORz0iZW4tdXMiPjwvU1BBTj48U1BB
TiBMQU5HPSJlbi11cyI+IDxGT05UIFNJWkU9MiBGQUNFPSJBcmlhbCI+4oCYPC9GT05UPjwvU1BB
Tj48U1BBTiBMQU5HPSJlbi11cyI+PC9TUEFOPjxTUEFOIExBTkc9ImVuLXVzIj48Rk9OVCBTSVpF
PTIgRkFDRT0iQXJpYWwiPnA0djwvRk9OVD48L1NQQU4+PFNQQU4gTEFORz0iZW4tdXMiPjwvU1BB
Tj48U1BBTiBMQU5HPSJlbi11cyI+IDxGT05UIFNJWkU9MiBGQUNFPSJBcmlhbCI+4oCTPC9GT05U
PjwvU1BBTj48U1BBTiBMQU5HPSJlbi11cyI+PC9TUEFOPjxTUEFOIExBTkc9ImVuLXVzIj48Rk9O
VCBTSVpFPTIgRkFDRT0iQXJpYWwiPm1lcmdlPC9GT05UPjwvU1BBTj48U1BBTiBMQU5HPSJlbi11
cyI+PC9TUEFOPjxTUEFOIExBTkc9ImVuLXVzIj48Rk9OVCBTSVpFPTIgRkFDRT0iQXJpYWwiPuKA
mTwvRk9OVD48L1NQQU4+PFNQQU4gTEFORz0iZW4tdXMiPjwvU1BBTj48U1BBTiBMQU5HPSJlbi11
cyI+PC9TUEFOPjwvUD4NCg0KPFAgQUxJR049TEVGVD48U1BBTiBMQU5HPSJlbi11cyI+PEZPTlQg
U0laRT0yIEZBQ0U9IkFyaWFsIj5JZiB5b3Ugd2FudCB0byB1c2UgcDR2IGFzIHlvdXIgbWVyZ2Ug
dG9vbCB1c2U6PC9GT05UPjwvU1BBTj48L1A+DQoNCjxQIEFMSUdOPUxFRlQ+PFNQQU4gTEFORz0i
ZW4tdXMiPjxGT05UIFNJWkU9MiBGQUNFPSJBcmlhbCI+QmFzaDo8L0ZPTlQ+PC9TUEFOPjxTUEFO
IExBTkc9ImVuLXVzIj48L1NQQU4+PFNQQU4gTEFORz0iZW4tdXMiPjwvU1BBTj48L1A+DQoNCjxQ
IEFMSUdOPUxFRlQ+PFNQQU4gTEFORz0iZW4tdXMiPjxGT05UIFNJWkU9MiBGQUNFPSJBcmlhbCI+
ZXhwb3J0PC9GT05UPjwvU1BBTj48U1BBTiBMQU5HPSJlbi11cyI+PC9TUEFOPjxTUEFOIExBTkc9
ImVuLXVzIj4gPEZPTlQgU0laRT0yIEZBQ0U9IkFyaWFsIj5QNDwvRk9OVD48L1NQQU4+PFNQQU4g
TEFORz0iZW4tdXMiPjwvU1BBTj48U1BBTiBMQU5HPSJlbi11cyI+PEZPTlQgU0laRT0yIEZBQ0U9
IkFyaWFsIj5NRVJHRTwvRk9OVD48L1NQQU4+PFNQQU4gTEFORz0iZW4tdXMiPjwvU1BBTj48U1BB
TiBMQU5HPSJlbi11cyI+PEZPTlQgU0laRT0yIEZBQ0U9IkFyaWFsIj49J3A0diAtbWVyZ2UnPC9G
T05UPjwvU1BBTj48U1BBTiBMQU5HPSJlbi11cyI+PC9TUEFOPjxTUEFOIExBTkc9ImVuLXVzIj48
L1NQQU4+PC9QPg0KDQo8UCBBTElHTj1MRUZUPjxTUEFOIExBTkc9ImVuLXVzIj48Rk9OVCBTSVpF
PTIgRkFDRT0iQXJpYWwiPmMtc2hlbGw6PC9GT05UPjwvU1BBTj48U1BBTiBMQU5HPSJlbi11cyI+
PC9TUEFOPjxTUEFOIExBTkc9ImVuLXVzIj48L1NQQU4+PC9QPg0KDQo8UCBBTElHTj1MRUZUPjxT
UEFOIExBTkc9ImVuLXVzIj48Rk9OVCBTSVpFPTIgRkFDRT0iQXJpYWwiPnNldGVudiBQNDwvRk9O
VD48L1NQQU4+PFNQQU4gTEFORz0iZW4tdXMiPjwvU1BBTj48U1BBTiBMQU5HPSJlbi11cyI+PEZP
TlQgU0laRT0yIEZBQ0U9IkFyaWFsIj5NRVJHRTwvRk9OVD48L1NQQU4+PFNQQU4gTEFORz0iZW4t
dXMiPjwvU1BBTj48U1BBTiBMQU5HPSJlbi11cyI+PEZPTlQgU0laRT0yIEZBQ0U9IkFyaWFsIj48
L0ZPTlQ+PC9TUEFOPjxTUEFOIExBTkc9ImVuLXVzIj48L1NQQU4+PFNQQU4gTEFORz0iZW4tdXMi
PiA8Rk9OVCBTSVpFPTIgRkFDRT0iQXJpYWwiPuKAmDwvRk9OVD48L1NQQU4+PFNQQU4gTEFORz0i
ZW4tdXMiPjwvU1BBTj48U1BBTiBMQU5HPSJlbi11cyI+PEZPTlQgU0laRT0yIEZBQ0U9IkFyaWFs
Ij5wNHY8L0ZPTlQ+PC9TUEFOPjxTUEFOIExBTkc9ImVuLXVzIj48L1NQQU4+PFNQQU4gTEFORz0i
ZW4tdXMiPiA8Rk9OVCBTSVpFPTIgRkFDRT0iQXJpYWwiPuKAkzwvRk9OVD48L1NQQU4+PFNQQU4g
TEFORz0iZW4tdXMiPjwvU1BBTj48U1BBTiBMQU5HPSJlbi11cyI+PEZPTlQgU0laRT0yIEZBQ0U9
IkFyaWFsIj5tZXJnZTwvRk9OVD48L1NQQU4+PFNQQU4gTEFORz0iZW4tdXMiPjwvU1BBTj48U1BB
TiBMQU5HPSJlbi11cyI+PEZPTlQgU0laRT0yIEZBQ0U9IkFyaWFsIj7igJk8L0ZPTlQ+PC9TUEFO
PjxTUEFOIExBTkc9ImVuLXVzIj48L1NQQU4+PFNQQU4gTEFORz0iZW4tdXMiPjwvU1BBTj48L1A+
DQoNCjxQIEFMSUdOPUxFRlQ+PFNQQU4gTEFORz0iZW4tdXMiPjxGT05UIFNJWkU9MiBGQUNFPSJB
cmlhbCI+VjwvRk9OVD48L1NQQU4+PFNQQU4gTEFORz0iZW4tdXMiPjwvU1BBTj48U1BBTiBMQU5H
PSJlbi11cyI+PEZPTlQgU0laRT0yIEZBQ0U9IkFyaWFsIj5lcnNpb25zIG9mIHA0djwvRk9OVD48
L1NQQU4+PFNQQU4gTEFORz0iZW4tdXMiPjwvU1BBTj48U1BBTiBMQU5HPSJlbi11cyI+IDxGT05U
IFNJWkU9MiBGQUNFPSJBcmlhbCI+cmVsZWFzZWQgcHJpb3IgdG8gMjAwNjwvRk9OVD48L1NQQU4+
PFNQQU4gTEFORz0iZW4tdXMiPjwvU1BBTj48U1BBTiBMQU5HPSJlbi11cyI+IDxGT05UIFNJWkU9
MiBGQUNFPSJBcmlhbCI+a2luZGEgc3VjayBzbyBpdCBwYXlzIHRvIHJ1biB0aGUgbGF0ZXM8L0ZP
TlQ+PC9TUEFOPjxTUEFOIExBTkc9ImVuLXVzIj48L1NQQU4+PFNQQU4gTEFORz0iZW4tdXMiPjxG
T05UIFNJWkU9MiBGQUNFPSJBcmlhbCI+dCB2ZXJzaW9uLjwvRk9OVD48L1NQQU4+PC9QPg0KDQo8
UCBBTElHTj1MRUZUPjxTUEFOIExBTkc9ImVuLXVzIj48Rk9OVCBTSVpFPTIgRkFDRT0iQXJpYWwi
PlQ8L0ZPTlQ+PC9TUEFOPjxTUEFOIExBTkc9ImVuLXVzIj48L1NQQU4+PFNQQU4gTEFORz0iZW4t
dXMiPjxGT05UIFNJWkU9MiBGQUNFPSJBcmlhbCI+aGUgbGF0ZXN0IHZlcnNpb24gb2YmbmJzcDsg
cDR2OjwvRk9OVD48L1NQQU4+PFNQQU4gTEFORz0iZW4tdXMiPjwvU1BBTj48U1BBTiBMQU5HPSJl
bi11cyI+PC9TUEFOPjwvUD4NCg0KPFAgQUxJR049TEVGVD48U1BBTiBMQU5HPSJlbi11cyI+PEZP
TlQgU0laRT0yIEZBQ0U9IkFyaWFsIj7vu788L0ZPTlQ+PC9TUEFOPjxTUEFOIExBTkc9ImVuLXVz
Ij48L1NQQU4+PFNQQU4gTEFORz0iZW4tdXMiPiA8Rk9OVCBTSVpFPTIgRkFDRT0iQXJpYWwiPu+7
v1Jldi4gUGVyZm9yY2UgVmlzdWFsIENsaWVudC9MSU5VWDI2WDg2LzIwMDcuMi8xMjgxNjY8L0ZP
TlQ+PC9TUEFOPjxTUEFOIExBTkc9ImVuLXVzIj48L1NQQU4+PFNQQU4gTEFORz0iZW4tdXMiPjwv
U1BBTj48L1A+DQoNCjxQIEFMSUdOPUxFRlQ+PFNQQU4gTEFORz0iZW4tdXMiPjxGT05UIFNJWkU9
MiBGQUNFPSJBcmlhbCI+QW5kIHllcywgSSBwdXQgdGhpcyBpbiBhIHdpa2kgcGFnZSBpbiB0aGUg
cGVyZm9yY2Ugc2VjdGlvbiBvZiB1c2VmdWwgaW5mb3JtYXRpb24uPC9GT05UPjwvU1BBTj48U1BB
TiBMQU5HPSJlbi11cyI+PC9TUEFOPjxTUEFOIExBTkc9ImVuLXVzIj48L1NQQU4+PC9QPg0KDQo8
L0JPRFk+DQo8L0hUTUw+

------_=_NextPart_001_01C7C8CF.2ED07981--
