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-19 10:33:25.000000000

Uploaded patch set 2.

-------------------------------------
author: Brenden Conley
date: 2015-06-19 11:07:09.000000000

Patch Set 2:

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

-------------------------------------
author: Brenden Conley
date: 2015-06-19 11:24:00.000000000

Patch Set 2: Verified+1

Build Successful 

https://hudson.eclipse.org/egit/job/egit.gerrit/7134/ : SUCCESS

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