DESCRIPTION

Replace 'Ask the user' with 'Prompt' in Merge tool preference

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

COMMENTS

author: Brenden Conley
date: 2011-11-07 17:55:00.000000000

Patch Set 1:

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

-------------------------------------
author: Brenden Conley
date: 2011-11-07 18:09:43.000000000

Patch Set 1:

Build Successful 
 
https://hudson.eclipse.org/sandbox/job/egit.gerrit/1911/ : SUCCESS

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