git-for-windows/git
1
0
Fork 0
mirror of https://github.com/git-for-windows/git.git synced 2026-04-28 18:44:04 -05:00
Code Issues Packages Projects Releases 335 Wiki Activity
1,819 Commits 23 Branches 1,111 Tags
bc7ccfd2d7342bf81d344c4215a17ebbb64d9212
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