diff options
| author |  Jonathan Nieder <jrnieder@gmail.com> | 2010-10-13 04:39:44 -0500 |
|---|---|---|
| committer | Jonathan Nieder <jrnieder@gmail.com> | 2011-03-27 23:27:55 -0500 |
| commit | ec71aa2e1f229b90092e6678ac7c2dca3d15b5f3 (patch) | |
| tree | 020d2f4773ec563f9458ef7fe786b0631ec3a13d /contrib/examples/git-resolve.sh | |
| parent | vcs-svn: read instructions from deltas (diff) | |
| download | tgif-ec71aa2e1f229b90092e6678ac7c2dca3d15b5f3.tar.xz | |
vcs-svn: implement copyfrom_data delta instruction
The copyfrom_data instruction copies a few bytes verbatim from the
novel text section of a window to the postimage.
[jn: with memory leak fix from David]
Improved-by: David Barr <david.barr@cordelta.com>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Acked-by: Ramkumar Ramachandra <artagnon@gmail.com>
Diffstat (limited to 'contrib/examples/git-resolve.sh')
0 files changed, 0 insertions, 0 deletions