Public Git Hosting - git.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: 4cd31a6 3facc60)

commit	33d3c6bb9bcc10b9aa5e46f66ef516c649b2c703
author	Jeff King <peff@peff.net>
	Thu, 25 Oct 2012 10:42:57 +0000 (25 06:42 -0400)
committer	Jeff King <peff@peff.net>
	Thu, 25 Oct 2012 10:42:57 +0000 (25 06:42 -0400)
tree	7715f2d419da7fbc136239f87649970132804417	tree \| snapshot (tar.gz zip)
parent	4cd31a6320d28742a79ce3aed3e479670ccc159a	commit \| diff
parent	3facc60031a5b860cae8cb26957e5b4e80820c34	commit \| diff

Merge branch 'da/mergetools-p4'

* da/mergetools-p4:
mergetools/p4merge: Handle "/dev/null"

The Best VCS Around