![[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) | ||
| commit | 90768daaa006516c7ae69ed89d7c2e67243dfac1 | |
| tree | b4f156b9104405c459ef464673ee1cd619268038 | tree | snapshot |
| parent | 5a798fb57f788692467b1a11416dd5ebff0d31ae | commit | diff |
| parent | b77b02785d2f589ca336fc449ee1c27837263dac | commit | diff |
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
* 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