DESCRIPTION

Make Merge Tool work for non-workspace files

Bug: 421734
Change-Id: Ic4d8c3f37b7d584f13f52fb819a0e924babaee35
Signed-off-by: Danika Greer xxx@xxx.xxx


COMMENTS

author: Brenden Conley
date: 2013-11-24 15:03:44.000000000

Patch Set 1:

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

-------------------------------------
author: Brenden Conley
date: 2013-11-24 15:17:00.000000000

Patch Set 1: Verified+1

Build Successful 

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

-------------------------------------
author: Danika Greer
date: 2013-12-03 22:01:01.000000000

Patch Set 2: Patch Set 1 was rebased

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