From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 30 Apr 2012 21:58:16 +0000 (-0700)
Subject: Merge branch 'ld/git-p4-tags-and-labels'
X-Git-Tag: v1.7.11-rc0~79
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9768cafe681a7844d5a1d067991053b25db83bbb;p=git.git

Merge branch 'ld/git-p4-tags-and-labels'

By Luke Diamand
* ld/git-p4-tags-and-labels:
  git p4: fix unit tests
  git p4: move verbose to base class
  git p4: Ignore P4EDITOR if it is empty
  git p4: Squash P4EDITOR in test harness
  git p4: fix-up "import/export of labels to/from p4"
  git p4: import/export of labels to/from p4
  git p4: Fixing script editor checks
---

9768cafe681a7844d5a1d067991053b25db83bbb