Andrew's git / gitweb.git / commit
?
Leave merge failures in the filesystem
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Wed, 8 Jun 2005 18:40:59 +0000 (11:40 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Wed, 8 Jun 2005 18:40:59 +0000 (11:40 -0700)
commit2a68a86...9f7dc55fd285d235ae2d19e7a8116c30
tree0d2977b...5c8d32c65e225d5b03b11711c1971d24copy hash to clipboard (tree)
parentf9e7750...21ca5e067f58a679caff5ff2f9881c4ccopy hash to clipboard (diff)
git-merge-one-file-script diff | blob | history