[gitg: 5/6] Merge branch 'highlighting'

[Jesse van den Kieboom <jessevdk src gnome org>]

commit 0573e0756b601710e370d010a978e880167521b5
Merge: b5efd19 d578ad0
Author: Jesse van den Kieboom <jessevdk gnome org>
Date:   Thu Dec 31 13:04:06 2015 +0100

    Merge branch 'highlighting'

 gitg/commit/gitg-commit.vala     |    4 +
 libgitg/gitg-diff-view-file.vala |  346 +++++++++++++++++++++++++++++++++++---
 libgitg/gitg-diff-view.vala      |    5 +-
 plugins/diff/gitg-diff.vala      |    3 +
 4 files changed, 332 insertions(+), 26 deletions(-)
---