DESCRIPTION

Added embedded diff/merge tool definitions like known in C-Git.

Added support for tool option without $BASE file.

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

COMMENTS

author: Genevieve Hudson
date: 2015-06-18 13:14:56.000000000

Uploaded patch set 1.

-------------------------------------
author: Brenden Conley
date: 2015-06-18 13:15:03.000000000

Patch Set 1:

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

-------------------------------------
author: Brenden Conley
date: 2015-06-18 13:33:00.000000000

Patch Set 1: Verified+1

Build Successful 

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

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