mirrors/git
0
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-12-14 12:23:35 +08:00
Code Issues Packages Projects Releases Wiki Activity
3d89cb4f3f
git/Documentation/technical
History
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
..
trivial-merge.txt [PATCH] Document the trivial merge rules for 3(+more ancestors)-way merges. 2005-09-10 18:27:41 -07:00