DESCRIPTION

[historyView] Performance third part

Renders a message instead of simply doing nothing when selecting a
file in a merge commit which we can not render a diff for.

Change-Id: I128356f6f81a38e595fbac17036af28d03f84e01
Signed-off-by: Willow Cantrell xxx@xxx.xxx


COMMENTS

author: Gerrit Johnathan Pham
date: 2011-02-18 14:05:44.000000000

Change cannot be merged due to unsatisfiable dependencies.

The following dependency errors were found:

* Depends on patch set 1 of Ie2823c3c, however the current patch set is 3.

Please rebase the change and upload a replacement commit.

-------------------------------------
author: Marlie Beasley
date: 2011-02-18 14:27:03.000000000

Uploaded patch set 2.

-------------------------------------
author: Marlie Beasley
date: 2011-02-18 14:29:06.000000000

Patch Set 2: Looks good to me, approved; Build Successful; IP review completed

Rebased to current master

-------------------------------------
author: Marlie Beasley
date: 2011-02-18 14:29:07.000000000

Change has been successfully merged into the git repository.

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