author | Junio C Hamano <gitster@pobox.com> | |
Sat, 5 Dec 2009 19:39:13 +0000 (11:39 -0800) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Sat, 5 Dec 2009 19:39:13 +0000 (11:39 -0800) |
Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 | 2 | |||
---|---|---|---|---|
Documentation/Makefile | patch | | diff1 | | diff2 | | blob | history |
Documentation/git.txt | patch | | diff1 | | diff2 | | blob | history |
builtin-rerere.c | patch | | diff1 | | diff2 | | blob | history |
diff --cc Documentation/Makefile
Simple merge
diff --cc Documentation/git.txt
Simple merge
diff --cc builtin-rerere.c
Simple merge