From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 6 Jun 2014 18:38:57 +0000 (-0700)
Subject: Merge branch 'mc/git-p4-prepare-p4-only'
X-Git-Tag: v2.1.0-rc0~147
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/eb5398a89122e4345b1fd3cab4f5630290bb3d0e?ds=inline;hp=--cc

Merge branch 'mc/git-p4-prepare-p4-only'

* mc/git-p4-prepare-p4-only:
git-p4: Do not include diff in spec file when just preparing p4
---

eb5398a89122e4345b1fd3cab4f5630290bb3d0e