DESCRIPTION

Add external merged file to the index (after a successful merge only).

Added setting to Git preferences to enable or disable "Add external
merged file to the index (after a successful merge only)".

Change-Id: Ic5d38c176be8a8a01346e414d2e425be1965ef1a
Signed-off-by: Genevieve Hudson xxx@xxx.xxx

COMMENTS

author: Genevieve Hudson
date: 2015-06-27 10:14:05.000000000

Uploaded patch set 3.

-------------------------------------
author: Brenden Conley
date: 2015-06-27 10:15:32.000000000

Patch Set 3:

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

-------------------------------------
author: Brenden Conley
date: 2015-06-27 10:16:44.000000000

Patch Set 3: Verified-1

Build Failed 

https://hudson.eclipse.org/egit/job/egit.gerrit/7182/ : FAILURE

-------------------------------------
author: Genevieve Hudson
date: 2015-06-27 11:02:02.000000000

Abandoned

new whole patch will be provided soon...

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