2 Commits

Author	SHA1	Message	Date
Junio C Hamano	7d95ee9351	[PATCH] Tests: read-tree -m test updates. ... This updates t1000 (basic 3-way merge test) to check the merge results for both successful cases (earlier one checked the result for only one of them). Also fixes typos in t1002 that broke '&&' chain, potentially missing a test failure before the chain got broken. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>	2005-06-08 10:19:53 -07:00
Junio C Hamano	c859600954	[PATCH] read-tree: save more user hassles during fast-forward. ... This implements the "never lose the current cache information or the work tree state, but favor a successful merge over merge failure" principle in the fast-forward two-tree merge operation. It comes with a set of tests to cover all the cases described in the case matrix found in the new documentation. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>	2005-06-07 11:41:51 -07:00