Merge branch 'va/p4-branch-import-test-update'
authorJunio C Hamano <gitster@pobox.com>
Fri, 2 Sep 2011 20:18:33 +0000 (13:18 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 2 Sep 2011 20:18:33 +0000 (13:18 -0700)
commit80ade02e4600217f153e7ee8fdf193ace3f3d189
treec41a984f989187bb51f85c23a60d1c86f22ada4e
parent5e2b3d7c6741fdd65e195fbe3af98b6d8d2fa551
parent9aa7c16f5ec96de9b5fe7b272832fbb061d1fee2
Merge branch 'va/p4-branch-import-test-update'

* va/p4-branch-import-test-update:
  git-p4: simple branch tests edits