kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity
1,877 Commits
7 Branches
1,000 Tags
174 MiB
Commit Graph

1 Commits (b5cf3c8b7767e5f2c8b0df718ef91ccfc36c61fe)

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