kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity
6,075 Commits
6 Branches
991 Tags
180 MiB
Commit Graph

1 Commits (b3c952f8386cebe12fc95227866683bb1cec99a9)

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