From: Junio C Hamano <junkio@cox.net>
Date: Sun, 11 Sep 2005 00:56:19 +0000 (-0700)
Subject: Use Daniel's read-tree in the merge strategy 'resolve'.
X-Git-Tag: v0.99.7~82
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/2276aa6c098a0337bc2bec49742e332bdd1b802c?hp=2276aa6c098a0337bc2bec49742e332bdd1b802c

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>
---