![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 24 Aug 2011 19:18:02 +0000 (12:18 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 24 Aug 2011 19:18:02 +0000 (12:18 -0700) |
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| 1 | 2 | |||
|---|---|---|---|---|
| Documentation/git.txt | patch | | diff1 | | diff2 | | blob | history |
| upload-pack.c | patch | | diff1 | | diff2 | | blob | history |
diff --cc Documentation/git.txt
Simple merge
diff --cc upload-pack.c
Simple merge