2 Commits

Author	SHA1	Message	Date
Junio C Hamano	f225b21807	[PATCH] Add read-tree -m 3-way merge tests. ... This adds a set of tests to make sure that requirements on existing cache entries are checked when a read-tree -m 3-way merge is run with an already populated index file. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>	2005-06-08 15:56:09 -07:00
Junio C Hamano	63713028cd	[PATCH] Add tests for diff-tree ... This adds and reorganizes some tests for diff-tree Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>	2005-05-20 09:27:43 -07:00