1 Commits (3a624b346db02a07b0317743b362d1a15c6c3c18)

Author	SHA1	Message	Date
Junio C Hamano	2276aa6c09	Use Daniel's read-tree in the merge strategy 'resolve'. ... And rename the one Linus kept calling stupid, 'stupid'. Signed-off-by: Junio C Hamano <junkio@cox.net>	2005-09-10 18:30:41 -07:00