diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-02-23 13:30:31 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-02-23 13:30:31 -0800 |
| commit | d065f687452a666c74f353306bb14debe48e40d3 (patch) | |
| tree | 275b59fe9f16903a0c7b1ebbecd74aeb7778afa7 /t/t5100/msg0014--scissors | |
| parent | Merge branch 'jk/config-include' (diff) | |
| parent | git-p4: add initial support for RCS keywords (diff) | |
| download | tgif-d065f687452a666c74f353306bb14debe48e40d3.tar.xz | |
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
Diffstat (limited to 't/t5100/msg0014--scissors')
0 files changed, 0 insertions, 0 deletions