Merge branch 'pw/maint-p4-rcs-expansion-newline' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 28 Nov 2012 20:04:32 +0000 (28 12:04 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 28 Nov 2012 20:04:50 +0000 (28 12:04 -0800)
"git p4" used to try expanding malformed "$keyword$" that spans
across multiple lines.

* 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