summaryrefslogtreecommitdiff
path: root/git-merge-stupid.sh
Commit message (Collapse)AuthorAgeFilesLines
* Use Daniel's read-tree in the merge strategy 'resolve'.Junio C Hamano2005-09-101-0/+80
And rename the one Linus kept calling stupid, 'stupid'. Signed-off-by: Junio C Hamano <junkio@cox.net>