summaryrefslogtreecommitdiff
path: root/pull.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-08 20:33:15 (GMT)
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-08 20:33:15 (GMT)
commit9c065315f70fb1086ef16fc37e72e3edbaf3e919 (patch)
tree5717f05f0dddfe22bff7b264c5c0b385fa29b0c1 /pull.c
parent3c65eb184992c2d088f30e0a788e598dab5bba2a (diff)
downloadgit-9c065315f70fb1086ef16fc37e72e3edbaf3e919.zip
git-9c065315f70fb1086ef16fc37e72e3edbaf3e919.tar.gz
git-9c065315f70fb1086ef16fc37e72e3edbaf3e919.tar.bz2
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 'pull.c')
0 files changed, 0 insertions, 0 deletions