DESCRIPTION

Fix NPE in DiffEditorPage

Solves a problem where merge commits that contain conflict resolutions
produce a NullPointerException when the "Diff" tab of the commit viewer
is opened.

Bug: 460442
Change-Id: I5834fa5fc73e7dfbf100eeba8c79e6d4e195f380
Signed-off-by: Clare Clay xxx@xxx.xxx

COMMENTS

author: Clare Clay
date: 2015-06-29 05:30:02.000000000

Uploaded patch set 1.

-------------------------------------
author: Brenden Conley
date: 2015-06-29 05:47:33.000000000

Patch Set 1:

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

-------------------------------------
author: Brenden Conley
date: 2015-06-29 06:07:42.000000000

Patch Set 1: Verified+1

Build Successful 

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

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