From: Jeff King <peff@peff.net>
Date: Thu, 25 Oct 2012 10:42:57 +0000 (-0400)
Subject: Merge branch 'da/mergetools-p4'
X-Git-Tag: v1.8.1-rc0~103
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=33d3c6bb9bcc10b9aa5e46f66ef516c649b2c703;p=thirdparty%2Fgit.git

Merge branch 'da/mergetools-p4'

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

33d3c6bb9bcc10b9aa5e46f66ef516c649b2c703