DESCRIPTION

Fix regression when calling the merge tool on folders

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


COMMENTS

author: Brenden Conley
date: 2015-01-13 15:14:55.000000000

Patch Set 8:

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

-------------------------------------
author: Brenden Conley
date: 2015-01-13 15:30:25.000000000

Patch Set 8: Verified+1

Build Successful 

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

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