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
..
trivial-merge.txt	[PATCH] Finish documenting trivial merge rules	2005-09-24 22:05:55 -07:00