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 11:45:24.000000000

Patch Set 7:

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

-------------------------------------
author: Brenden Conley
date: 2015-01-13 11:45:42.000000000

Patch Set 7: Verified-1

Build Failed 

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

-------------------------------------
author: Gustavo Green
date: 2015-01-13 15:14:49.000000000

Patch Set 8: Patch Set 7 was rebased

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