Merge branch 'ld/git-p4-tags-and-labels' into next
commitbf55d92c25af110e1cf6c03ff0c5bde32743453c
authorJunio C Hamano <gitster@pobox.com>
Tue, 24 Apr 2012 22:03:31 +0000 (24 15:03 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 24 Apr 2012 22:03:31 +0000 (24 15:03 -0700)
tree14ff0b05c03c2253bbe212a7c12043e48bbaa0e2
parentd5c30be4490f09dd3db9c17b3a133e0bb6f8924f
parent6a10b6aa1e7b9bb114e525edb67b7650b46f333e
Merge branch 'ld/git-p4-tags-and-labels' into next

By Luke Diamand
* ld/git-p4-tags-and-labels:
  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"