DESCRIPTION

[wip] Fix regression when calling the merge tool on folders

Change-Id: Iadc891d4a028e58c50f9ad44aac5ce536e072838
Signed-off-by: Gustavo Green xxx@xxx.xxx
Signed-off-by: Karter Mora xxx@xxx.xxx
Also-by: Karter Mora xxx@xxx.xxx


COMMENTS

author: Rylee Bush
date: 2015-03-26 09:57:58.000000000

Uploaded patch set 10.

-------------------------------------
author: Brenden Conley
date: 2015-03-26 11:40:26.000000000

Patch Set 10:

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

-------------------------------------
author: Brenden Conley
date: 2015-03-26 11:55:59.000000000

Patch Set 10: Verified+1

Build Successful 

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

-------------------------------------
author: Gustavo Green
date: 2015-05-19 08:34:18.000000000

Abandoned

Merged within https://git.eclipse.org/r/#/c/22672/15

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