global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-04-01 12:30:09 +02:00
Code Issues Packages Projects Releases Wiki Activity
Files
ea376fa7f2c209593bcc63008a2831fe013d4e39
git/git-merge-stupid.sh
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

1.4 KiB
Executable File
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink