Merge branch 'ld/git-p4-expanded-keywords'

* ld/git-p4-expanded-keywords:
: Teach git-p4 to unexpand $RCS$-like keywords that are embedded in
: tracked contents in order to reduce unnecessary merge conflicts.
git-p4: add initial support for RCS keywords

diff --cc contrib/fast-import/git-p4
Simple merge