Merge branch 'va/fix-git-p4-tests' into next
commit795e858a7485eff64d620fdad9d63f1fbadf982b
authorJunio C Hamano <gitster@pobox.com>
Wed, 6 May 2015 04:14:42 +0000 (5 21:14 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 6 May 2015 04:14:42 +0000 (5 21:14 -0700)
tree423018b53176c7e9bd6797716edb0210c44edb5b
parent03ecbd032dc0711729cbbf9e0fee2014e687206a
parent896e700ad92890b59568a52b88e9bd22eec6f9e7
Merge branch 'va/fix-git-p4-tests' into next

* va/fix-git-p4-tests:
  git-p4: t9814: prevent --chain-lint failure