diff options
| author | Martin Langhoff <martin@catalyst.net.nz> | 2005-11-11 18:00:57 +1300 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-11-11 01:15:26 -0800 |
| commit | f84f9d38ebd809ecab89d2d4926c3ff6bc3c60f5 (patch) | |
| tree | d01698963c91c32679e4a9a52a4ac94a5feee296 /git-merge-resolve.sh | |
| parent | 0e9ab02da77fcf59fdb7d8201d3c5546cd346e63 (diff) | |
| download | git-f84f9d38ebd809ecab89d2d4926c3ff6bc3c60f5.tar.gz | |
archimport: handle pika escaping
Arch uses pika escaping in some places (but not all!). Specifically, commits of
the type 'patch' use pika escaping in the log entries, which we parse to know
what to add/delete and what to commit.
This patch checks for hints of pika escaping and asks tla to unescape for us.
Originally implemented by Penny Leach <penny@catalyst.net.nz>
Signed-off-by: Martin Langhoff <martin@catalyst.net.nz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions