From: Junio C Hamano <junkio@cox.net>
Date: Tue, 7 Feb 2006 09:19:49 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/gitk/gitk
X-Git-Tag: v1.2.0~40
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=90768daaa006516c7ae69ed89d7c2e67243dfac1;p=git.git

Merge git://git.kernel.org/pub/scm/gitk/gitk

* git://git.kernel.org/pub/scm/gitk/gitk:
  gitk: Use git-diff-tree --cc for showing the diffs for merges
  gitk: Add braces around if expressions
---

90768daaa006516c7ae69ed89d7c2e67243dfac1