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-10-06 09:43:02.000000000

Patch Set 6:

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

-------------------------------------
author: Brenden Conley
date: 2014-10-06 09:58:05.000000000

Patch Set 6: Verified+1

Build Successful 

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

-------------------------------------
author: Gustavo Green
date: 2015-01-13 10:44:28.000000000

Patch Set 7: Patch Set 6 was rebased

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