git-for-windows/git
1
0
Fork 0
mirror of https://github.com/git-for-windows/git.git synced 2026-03-15 17:42:52 -05:00
Code Issues Packages Projects Releases 335 Wiki Activity
Files
a7ca65405c364e674cf4359b07ae959d4ece01ab
git/git-resolve-script
Linus Torvalds 9c065315f7 Make "git commit" work correctly in the presense of a manual merge 
This has gotten only very light testing, but something like this is
clearly necessary and did the right thing for the one case I threw at
it.
2005-06-08 13:33:15 -07:00

1.6 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink