git-for-windows/git
1
0
Fork 0
mirror of https://github.com/git-for-windows/git.git synced 2026-04-08 12:37:14 -05:00
Code Issues Packages Projects Releases 335 Wiki Activity
Files
8eef4d3ed13d7604056b26ce58d0db007be530dd
git/git-resolve-script
Linus Torvalds d5a72fd622 Fix git-resolve-script. 
I'd stupidly forgotten one merge_head -> merge conversion, and
all my tests were for the fast-forward case that never triggered
the bug.
2005-05-05 16:07:56 -07:00

1.5 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink