Merge branch 'ld/git-p4-tags-and-labels'
authorJunio C Hamano <gitster@pobox.com>
Thu, 17 May 2012 22:21:46 +0000 (15:21 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 17 May 2012 22:21:46 +0000 (15:21 -0700)
By Luke Diamand
* ld/git-p4-tags-and-labels:
git p4: fix bug when enabling tag import/export via config variables
git p4: fix bug when verbose enabled with tag export
git p4: add test for tag import/export enabled via config

1  2 
git-p4.py
diff --cc git-p4.py
Simple merge