mirror of
https://github.com/git/git.git
synced 2024-11-28 04:23:30 +08:00
Merge branch 'jn/mailinfo-scissors'
* jn/mailinfo-scissors: Teach mailinfo %< as an alternative scissors mark
This commit is contained in:
commit
d6b5af6d76
@ -746,7 +746,8 @@ static int is_scissors_line(const struct strbuf *line)
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
if (i + 1 < len &&
|
if (i + 1 < len &&
|
||||||
(!memcmp(buf + i, ">8", 2) || !memcmp(buf + i, "8<", 2))) {
|
(!memcmp(buf + i, ">8", 2) || !memcmp(buf + i, "8<", 2) ||
|
||||||
|
!memcmp(buf + i, ">%", 2) || !memcmp(buf + i, "%<", 2))) {
|
||||||
in_perforation = 1;
|
in_perforation = 1;
|
||||||
perforation += 2;
|
perforation += 2;
|
||||||
scissors += 2;
|
scissors += 2;
|
||||||
|
Loading…
Reference in New Issue
Block a user