[PATCH] Document the trivial merge rules for 3(+more ancestors)-way merges.
[git.git] / ssh-upload.c
2005-09-08 Junio C HamanoBig tool rename.