From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 23 Feb 2012 21:30:31 +0000 (-0800)
Subject: Merge branch 'ld/git-p4-expanded-keywords'
X-Git-Tag: v1.7.10-rc0~51
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d065f687452a666c74f353306bb14debe48e40d3;p=git.git

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
---

d065f687452a666c74f353306bb14debe48e40d3