admin/git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,828 Commits 1 Branch 0 Tags
27cfe2e2dcbfc4f6c6288ed4eafd077e232c2ab1
Commit Graph

1 Commits

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