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-07-30 13:17:45.000000000

Patch Set 5:

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

-------------------------------------
author: Brenden Conley
date: 2014-07-30 13:32:45.000000000

Patch Set 5: Verified+1

Build Successful 

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

-------------------------------------
author: Gustavo Green
date: 2014-10-06 08:33:40.000000000

Patch Set 6: Patch Set 5 was rebased

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