mirrors/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-17 14:34:49 +01:00
Code Activity
1751 commits 6 branches 956 tags 531 MiB
Commit graph

1 commit

Author SHA1 Message Date
Daniel Barkalow
3d89cb4f3f [PATCH] Document the trivial merge rules for 3(+more ancestors)-way merges. 
Signed-off-by: Daniel Barkalow
Signed-off-by: Junio C Hamano <junkio@cox.net>
 2005-09-10 18:27:41 -07:00