author | Junio C Hamano <gitster@pobox.com> | |
Mon, 12 Sep 2011 17:43:17 +0000 (10:43 -0700) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Mon, 12 Sep 2011 17:43:17 +0000 (10:43 -0700) |
Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 | 2 | |||
---|---|---|---|---|
Documentation/git.txt | patch | | diff1 | | diff2 | | blob | history |
submodule.c | patch | | diff1 | | diff2 | | blob | history |
diff --cc Documentation/git.txt
Simple merge
diff --cc submodule.c
Simple merge