![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 23 Feb 2012 21:30:31 +0000 (13:30 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 23 Feb 2012 21:30:31 +0000 (13:30 -0800) |
* 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
: 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
| 1 | 2 | |||
|---|---|---|---|---|
| contrib/fast-import/git-p4 | patch | | diff1 | | diff2 | | blob | history |
diff --cc contrib/fast-import/git-p4
Simple merge