Andrew's git / gitweb.git / diff
?
Use Daniel's read-tree in the merge strategy 'resolve'.
authorJunio C Hamano <junkio@cox.net>
Sun, 11 Sep 2005 00:56:19 +0000 (17:56 -0700)
committerJunio C Hamano <junkio@cox.net>
Sun, 11 Sep 2005 01:30:41 +0000 (18:30 -0700)
And rename the one Linus kept calling stupid, 'stupid'.

Signed-off-by: Junio C Hamano <junkio@cox.net>
No differences found