global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-02-03 06:21:39 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,819 Commits 6 Branches 1,000 Tags
v0.99.7a
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