Merge branch 'pw/git-p4'
authorJunio C Hamano <gitster@pobox.com>
Mon, 23 Apr 2012 19:40:02 +0000 (12:40 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 23 Apr 2012 19:40:03 +0000 (12:40 -0700)
commit4c9d7bc4a68e0c0608e865ccac69a517bc3f65b7
treefccbf03d664f1edc0eed0fd0f5394891cbd841f3
parent29a03fa5625433e5fc90da2f823b4277960537ae
parent6ab1d76c3cf96aac77a75565dfaa0cf64aa100a1
Merge branch 'pw/git-p4'

By Pete Wyckoff
* pw/git-p4:
  git p4: use "git p4" directly in tests
  git p4: update name in script
  git-p4: move to toplevel
Makefile