Merge git://git.kernel.org/pub/scm/gitk/gitk · git-mirror/git@90768da · GitHub

Commit

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

Browse files

* 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

Loading branch information

Junio C Hamano committed Feb 7, 2006

2 parents 5a798fb + b77b027 commit 90768da