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

Uploaded patch set 2.

-------------------------------------
author: Brenden Conley
date: 2015-06-19 12:21:24.000000000

Patch Set 2:

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

-------------------------------------
author: Brenden Conley
date: 2015-06-19 12:39:36.000000000

Patch Set 2: Verified+1

Build Successful 

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

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