3 commits

Author	SHA1	Message	Date
Thomas Ackermann	5316c8e939	Documentation/technical: convert plain text files to asciidoc ... These were not originally meant for asciidoc, but they are already so close. Mark them up in asciidoc. Signed-off-by: Thomas Ackermann <th.acker@arcor.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>	2012-10-16 16:09:09 -07:00
Daniel Barkalow	7061f5c2c5	[PATCH] Finish documenting trivial merge rules ... Fix missing symbol explanations, a few incorrect cases, and add two-way merge rules. Signed-off-by: Daniel Barkalow <barkalow@iabervon.org> Signed-off-by: Junio C Hamano <junkio@cox.net>	2005-09-24 22:05:55 -07:00
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