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-05-05 08:49:37.000000000

Patch Set 4:

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

-------------------------------------
author: Brenden Conley
date: 2014-05-05 08:50:17.000000000

Patch Set 4: Verified-1

Build Failed 

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

-------------------------------------
author: Brenden Conley
date: 2014-05-05 19:18:16.000000000

Patch Set 4: -Verified

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

-------------------------------------
author: Brenden Conley
date: 2014-05-05 19:19:45.000000000

Patch Set 4: Verified-1

Build Failed 

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

-------------------------------------
author: Gustavo Green
date: 2014-07-30 13:09:53.000000000

Patch Set 5: Patch Set 4 was rebased

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