DESCRIPTION

Introduce internal API to integrate Team merging.

Team provides a number of APIs to provide access to merge,
comparison and synchronization features. This introduces a
git-specific Subscriber implementation that can retrieve
information from three different sources, along with
implementations to use the index or a TreeWalk to populate
these three 'sources'.

CQ: 9453
Bug: 418151
JGit-Dependency: I722352e619794988791c452545d57b17dada407a
Change-Id: Ieda23bb556d342f421f03b93c7faa160998598aa
Also-by: Gustavo Green xxx@xxx.xxx
Signed-off-by: Karter Mora xxx@xxx.xxx
Signed-off-by: Maleah Marks xxx@xxx.xxx
Signed-off-by: Douglas Trujillo xxx@xxx.xxx

COMMENTS

author: Maleah Marks
date: 2015-04-02 14:06:14.000000000

Uploaded patch set 12.

-------------------------------------
author: Brenden Conley
date: 2015-04-02 14:06:21.000000000

Patch Set 12:

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

-------------------------------------
author: Brenden Conley
date: 2015-04-02 14:07:24.000000000

Patch Set 12: Verified-1

Build Failed 

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

-------------------------------------
author: Douglas Trujillo
date: 2015-04-20 21:39:27.000000000

Patch Set 12:

- CQ 9453 was approved

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