Commit Graph

1 Commits (365527adbfa8a16dfc05ab71818602f55ada55ba)

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