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:09:03.000000000

Patch Set 1:

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

-------------------------------------
author: Douglas Trujillo
date: 2012-12-08 00:11:16.000000000

Patch Set 1: Abandoned

wrong target branch

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