global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-01-13 04:06:01 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
365527adbfa8a16dfc05ab71818602f55ada55ba
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