![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | |
| Wed, 8 Jun 2005 20:33:15 +0000 (13:33 -0700) | ||
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | |
| Wed, 8 Jun 2005 20:33:15 +0000 (13:33 -0700) | ||
| commit | 9c065315f70fb1086ef16fc37e72e3edbaf3e919 | |
| tree | 5717f05f0dddfe22bff7b264c5c0b385fa29b0c1 | tree | snapshot |
| parent | 3c65eb184992c2d088f30e0a788e598dab5bba2a | commit | diff |
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.
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.
| git-commit-script | diff | blob | history | |
| git-resolve-script | diff | blob | history |