Merge branch 'pw/maint-p4-rcs-expansion-newline'
authorJunio C Hamano <gitster@pobox.com>
Tue, 20 Nov 2012 18:34:15 +0000 (20 10:34 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 20 Nov 2012 18:34:15 +0000 (20 10:34 -0800)
I do not have p4 to play with, but looks obviously correct to me.

* pw/maint-p4-rcs-expansion-newline:
  git p4: RCS expansion should not span newlines

1  2 
git-p4.py
t/t9810-git-p4-rcs.sh

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