DESCRIPTION

Remove "Ask the user" from Merge tool preference label

Bug: 360257
Change-Id: Ic4509bcc4ed0d2d1361919fa9ac1fdbd8aeaf19f
Signed-off-by: Jaidyn Nichols xxx@xxx.xxx
Signed-off-by: Douglas Trujillo xxx@xxx.xxx

COMMENTS

author: Douglas Trujillo
date: 2011-11-07 21:59:04.000000000

Uploaded patch set 4.

-------------------------------------
author: Douglas Trujillo
date: 2011-11-07 21:59:24.000000000

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

rebased

-------------------------------------
author: Douglas Trujillo
date: 2011-11-07 21:59:25.000000000

Change has been successfully merged into the git repository.

-------------------------------------
author: Brenden Conley
date: 2011-11-07 22:04:08.000000000

Patch Set 4:

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

-------------------------------------
author: Brenden Conley
date: 2011-11-07 22:22:37.000000000

Patch Set 4:

Build Unstable 
 
https://hudson.eclipse.org/sandbox/job/egit.gerrit/1925/ : UNSTABLE

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