![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <junkio@cox.net> | |
| Sat, 24 Sep 2005 01:46:34 +0000 (18:46 -0700) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Sat, 24 Sep 2005 01:46:34 +0000 (18:46 -0700) |
Signed-off-by: Junio C Hamano <junkio@cox.net>
| 1 | 2 | |||
|---|---|---|---|---|
| .gitignore | patch | | diff1 | | diff2 | | blob | history |
| Documentation/git-diff-tree.txt | patch | | diff1 | | diff2 | | blob | history |
diff --cc .gitignore
Simple merge
diff --cc Documentation/git-diff-tree.txt
Simple merge