Make "git commit" work correctly in the presense of a manual merge
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Wed, 8 Jun 2005 20:33:15 +0000 (13:33 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Wed, 8 Jun 2005 20:33:15 +0000 (13:33 -0700)
commit9c06531...f70fb1086ef16fc37e72e3edbaf3e919
tree5717f05...0dddfe22bff7b264c5c0b385fa29b0c1copy hash to clipboard (tree)
parent3c65eb1...4992c2d088f30e0a788e598dab5bba2acopy hash to clipboard (diff)
git-commit-script
git-resolve-script