3 Commits (f4a11066cfb70c49fddbca7f95aa0fedcee53cca)

Author SHA1 Message Date
Junio C Hamano 76cead391f Documentation: fix missing links to git(7) 19 years ago
Daniel Barkalow 7061f5c2c5 [PATCH] Finish documenting trivial merge rules 19 years ago
Daniel Barkalow 3d89cb4f3f [PATCH] Document the trivial merge rules for 3(+more ancestors)-way merges. 19 years ago