DESCRIPTION

Make Merge Tool work for non-workspace files

It should even work for a repository that does not even have a single
project in the workspace (I don't know why one would actually do that
though).

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

COMMENTS

author: Douglas Trujillo
date: 2013-12-09 21:37:13.000000000

Uploaded patch set 2.

-------------------------------------
author: Brenden Conley
date: 2013-12-09 21:37:19.000000000

Patch Set 2:

Build Started https://hudson.eclipse.org/egit/job/egit-stable.gerrit/240/

-------------------------------------
author: Douglas Trujillo
date: 2013-12-09 21:37:41.000000000

Patch Set 2: Code-Review+2 IP-Clean+1

rebased

-------------------------------------
author: Brenden Conley
date: 2013-12-09 22:00:29.000000000

Patch Set 2: Verified+1

Build Successful 

https://hudson.eclipse.org/egit/job/egit-stable.gerrit/240/ : SUCCESS

-------------------------------------
author: Douglas Trujillo
date: 2013-12-09 22:13:15.000000000

Change has been successfully merged into the git repository.

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