git/git-commit-script at 9c065315f70fb1086ef16fc37e72e3edbaf3e919

dilim/git

mirror of https://github.com/git/git.git synced 2026-07-04 13:49:06 +00:00

Files

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

View Raw