DESCRIPTION

Remove "Ask the user" from Merge tool preference label

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

COMMENTS

author: Jaidyn Nichols
date: 2011-11-07 17:23:49.000000000

Uploaded patch set 3.

-------------------------------------
author: Brenden Conley
date: 2011-11-07 18:41:49.000000000

Patch Set 3:

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

-------------------------------------
author: Brenden Conley
date: 2011-11-07 18:58:03.000000000

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

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

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