merge-one-file: leave unmerged index entries upon automerge failure.
authorLinus Torvalds <torvalds@osdl.org>
Wed, 30 Nov 2005 05:06:10 +0000 (21:06 -0800)
committerJunio C Hamano <junkio@cox.net>
Wed, 30 Nov 2005 08:14:19 +0000 (00:14 -0800)
commit354b9b5...b0a02ce7e32a7b0c10caaa1e3532f22b
tree4c052b8...be821bc8fc6366501ee0583432849e86copy hash to clipboard (tree)
parent10637b8...d91cf8870d1db8609a10dc5e58722378copy hash to clipboard (diff)
git-merge-one-file.sh