mirror of
https://github.com/git/git.git
synced 2026-03-13 02:13:24 +01:00
Merge branch 'jn/mailinfo-scissors' into next
* jn/mailinfo-scissors: Teach mailinfo %< as an alternative scissors mark
This commit is contained in:
@@ -746,7 +746,8 @@ static int is_scissors_line(const struct strbuf *line)
|
||||
continue;
|
||||
}
|
||||
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;
|
||||
perforation += 2;
|
||||
scissors += 2;
|
||||
|
||||
Reference in New Issue
Block a user