diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-08 13:33:15 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-08 13:33:15 -0700 |
| commit | 9c065315f70fb1086ef16fc37e72e3edbaf3e919 (patch) | |
| tree | 5717f05f0dddfe22bff7b264c5c0b385fa29b0c1 /git-deltafy-script | |
| parent | 3c65eb184992c2d088f30e0a788e598dab5bba2a (diff) | |
| download | git-9c065315f70fb1086ef16fc37e72e3edbaf3e919.tar.gz | |
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.
Diffstat (limited to 'git-deltafy-script')
0 files changed, 0 insertions, 0 deletions