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-27 10:14:05.000000000

Uploaded patch set 3.

-------------------------------------
author: Brenden Conley
date: 2015-06-27 10:53:24.000000000

Patch Set 3:

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

-------------------------------------
author: Brenden Conley
date: 2015-06-27 10:54:35.000000000

Patch Set 3: Verified-1

Build Failed 

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

-------------------------------------
author: Genevieve Hudson
date: 2015-06-27 11:01:54.000000000

Abandoned

new whole patch will be provided soon...

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