Merge branch 'da/mergetools-p4'
authorJeff King <peff@peff.net>
Thu, 25 Oct 2012 10:42:57 +0000 (25 06:42 -0400)
committerJeff King <peff@peff.net>
Thu, 25 Oct 2012 10:42:57 +0000 (25 06:42 -0400)
* da/mergetools-p4:
  mergetools/p4merge: Handle "/dev/null"


Trivial merge