DESCRIPTION

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

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


COMMENTS

author: Danika Greer
date: 2012-12-09 10:59:26.000000000

Uploaded patch set 4.

-------------------------------------
author: Brenden Conley
date: 2012-12-09 10:59:32.000000000

Patch Set 4:

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

-------------------------------------
author: Danika Greer
date: 2012-12-09 10:59:55.000000000

Patch Set 4: Verified; Looks good to me, approved; IP review completed



-------------------------------------
author: Danika Greer
date: 2012-12-09 10:59:56.000000000

Change has been successfully merged into the git repository.

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