DESCRIPTION

Replace 'OK' with 'Cancel' on 'Checkout Conflicts' dialog

Bug: 394682
Change-Id: I96c8bcc917eb51251bdac95547b3c038ebbc2259
Signed-off-by: Douglas Trujillo xxx@xxx.xxx


COMMENTS

author: Brenden Conley
date: 2012-12-08 00:47:53.000000000

Patch Set 1:

Build Started https://hudson.eclipse.org/sandbox/job/egit.gerrit/3795/ 

-------------------------------------
author: Brenden Conley
date: 2012-12-08 01:13:15.000000000

Patch Set 1: I would prefer that you didn't submit this

Build Unstable 

https://hudson.eclipse.org/sandbox/job/egit.gerrit/3795/ : UNSTABLE

-------------------------------------
author: Danika Greer
date: 2012-12-08 11:42:18.000000000

Patch Set 1: Verified

Copyright must be updated. Otherwise looks good, tests work here.

-------------------------------------
