Merge branch 'ld/p4-submit-hint'
authorJunio C Hamano <gitster@pobox.com>
Wed, 11 Feb 2015 21:39:44 +0000 (13:39 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 11 Feb 2015 21:39:44 +0000 (13:39 -0800)
* ld/p4-submit-hint:
git-p4: correct --prepare-p4-only instructions

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