Code

gitk: Unify handling of merge diffs with normal 2-way diffs