Merge git://git.kernel.org/pub/scm/gitk/gitk
authorJunio C Hamano <redacted>
Tue, 7 Feb 2006 09:19:49 +0000 (01:19 -0800)
committerJunio C Hamano <redacted>
Tue, 7 Feb 2006 09:19:49 +0000 (01:19 -0800)
* 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


Trivial merge
git clone https://git.99rst.org/PROJECT