Files
git/git-resolve-script
Linus Torvalds e5b905c448 git-resolve-script: stop when the automated merge fails
No point in doing a tree write that will just throw
confusing messages on the screen.
2005-06-06 19:37:25 -07:00

1.6 KiB