Merge branch 'da/mergetools-p4'
authorJeff King <peff@peff.net>
Thu, 25 Oct 2012 10:42:57 +0000 (06:42 -0400)
committerJeff King <peff@peff.net>
Thu, 25 Oct 2012 10:42:57 +0000 (06:42 -0400)
commit33d3c6bb9bcc10b9aa5e46f66ef516c649b2c703
tree7715f2d419da7fbc136239f87649970132804417
parent4cd31a6320d28742a79ce3aed3e479670ccc159a
parent3facc60031a5b860cae8cb26957e5b4e80820c34
Merge branch 'da/mergetools-p4'

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