![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <junkio@cox.net> | |
| Tue, 7 Feb 2006 09:19:49 +0000 (01:19 -0800) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| 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
gitk: Use git-diff-tree --cc for showing the diffs for merges
gitk: Add braces around if expressions
Trivial merge