averello/git-mirror
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2025-12-18 12:00:25 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
2c865d9aa7b9c3511f901b2544b667c5188f510e
git-mirror/git-merge-resolve.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

864 B
Executable File
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink