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)
commit566487c...a617c12d68bf22c7078bce0b94fc8121
treea093760...a02425fc618e2d2017f4266ca9240052copy hash to clipboard (tree)
parentec73962...8e17e89ac0c4b21f07cefe16594e07a2copy hash to clipboard (diff)
parentae3858e...e9146208f1608445975e2761c9b0482ecopy hash to clipboard (diff)
git-merge-one-file-script