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