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: 2014-03-04 13:44:42.000000000

Patch Set 1:

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

-------------------------------------
author: Brenden Conley
date: 2014-03-04 13:45:38.000000000

Patch Set 1: Verified-1

Build Failed 

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

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