DESCRIPTION

Fix regression when calling the merge tool on folders

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


COMMENTS

author: Gustavo Green
date: 2014-03-06 09:24:34.000000000

Uploaded patch set 2.

-------------------------------------
author: Brenden Conley
date: 2014-03-06 10:21:17.000000000

Patch Set 2:

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

-------------------------------------
author: Brenden Conley
date: 2014-03-06 10:21:46.000000000

Patch Set 2: Verified-1

Build Failed 

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

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