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 10:31:16.000000000

Uploaded patch set 3.

-------------------------------------
author: Brenden Conley
date: 2014-03-06 10:36:20.000000000

Patch Set 3:

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

-------------------------------------
author: Brenden Conley
date: 2014-03-06 10:37:03.000000000

Patch Set 3: Verified-1

Build Failed 

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

-------------------------------------
author: Gustavo Green
date: 2014-05-05 08:27:29.000000000

Patch Set 4: Patch Set 3 was rebased

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