diff options
| author |  Jonathan Nieder <jrnieder@gmail.com> | 2010-10-13 04:50:07 -0500 |
|---|---|---|
| committer | Jonathan Nieder <jrnieder@gmail.com> | 2011-03-27 23:28:27 -0500 |
| commit | d3f131b57ec0e69a37bca882fa6bf39aa4c1c387 (patch) | |
| tree | bfef23ef1c2f350eb8c1c813d2b2fa51f7884b4b /Documentation/git-merge.txt | |
| parent | vcs-svn: verify that deltas consume all inline data (diff) | |
| download | tgif-d3f131b57ec0e69a37bca882fa6bf39aa4c1c387.tar.xz | |
vcs-svn: let deltas use data from postimage
The copyfrom_target instruction copies appends data that is already
present in the current output view to the end of output. (The offset
argument is relative to the beginning of output produced in the
current window.)
The region copied is allowed to run past the end of the existing
output. To support that case, copy one character at a time rather
than calling memcpy or memmove. This allows copyfrom_target to be
used once to repeat a string many times. For example:
COPYFROM_DATA 2
COPYFROM_OUTPUT 10, 0
DATA "ab"
would produce the output "ababababababababababab".
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Acked-by: Ramkumar Ramachandra <artagnon@gmail.com>
Diffstat (limited to 'Documentation/git-merge.txt')
0 files changed, 0 insertions, 0 deletions