Merge my and Petr's git-merge-one-file-script modifications
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Wed, 8 Jun 2005 23:54:23 +0000 (16:54 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Wed, 8 Jun 2005 23:54:23 +0000 (16:54 -0700)
commit566487c8a617c12d68bf22c7078bce0b94fc8121
treea0937604a02425fc618e2d2017f4266ca9240052
parentec73962d8e17e89ac0c4b21f07cefe16594e07a2
parentae3858e7e9146208f1608445975e2761c9b0482e
Merge my and Petr's git-merge-one-file-script modifications
git-merge-one-file-script