mirror of
https://github.com/torproject/torspec.git
synced 2024-11-27 11:50:32 +00:00
Merge remote-tracking branch 'tor-gitlab/mr/24'
This commit is contained in:
commit
6a8e5400bd
@ -4060,7 +4060,6 @@ E. Limited ed diff format
|
|||||||
- "<n1>,<n2>c" Replace lines n1 through n2, inclusive, with the
|
- "<n1>,<n2>c" Replace lines n1 through n2, inclusive, with the
|
||||||
following block.
|
following block.
|
||||||
- "<n1>a" Append the following block after line n1.
|
- "<n1>a" Append the following block after line n1.
|
||||||
- "a" Append the following block after the current line.
|
|
||||||
|
|
||||||
Note that line numbers always apply to the file after all previous
|
Note that line numbers always apply to the file after all previous
|
||||||
commands have already been applied. Note also that line numbers
|
commands have already been applied. Note also that line numbers
|
||||||
@ -4076,12 +4075,6 @@ E. Limited ed diff format
|
|||||||
successfully apply the diff even if they have an unusual encoding for
|
successfully apply the diff even if they have an unusual encoding for
|
||||||
the signatures.
|
the signatures.
|
||||||
|
|
||||||
The "current line" is either the first line of the file, if this is
|
|
||||||
the first command, the last line of a block we added in an append or
|
|
||||||
change command, or the line immediate following a set of lines we just
|
|
||||||
deleted (or the last line of the file if there are no lines after
|
|
||||||
that).
|
|
||||||
|
|
||||||
The replace and append command take blocks. These blocks are simply
|
The replace and append command take blocks. These blocks are simply
|
||||||
appended to the diff after the line with the command. A line with
|
appended to the diff after the line with the command. A line with
|
||||||
just a period (".") ends the block (and is not part of the lines
|
just a period (".") ends the block (and is not part of the lines
|
||||||
|
Loading…
Reference in New Issue
Block a user