diff options
| author |  Jonathan Nieder <jrnieder@gmail.com> | 2011-05-26 02:27:48 -0500 |
|---|---|---|
| committer | Jonathan Nieder <jrnieder@gmail.com> | 2011-05-26 02:27:48 -0500 |
| commit | e9f3f8b6f4141dae526e9792ba6dede7aa038622 (patch) | |
| tree | e4d1b8abaaef180f844b1d0f57afbc87e4c4f677 /merge-recursive.c | |
| parent | Merge branch 'db/svn-fe-code-purge' into svn-fe (diff) | |
| parent | vcs-svn: let deltas use data from preimage (diff) | |
| download | tgif-e9f3f8b6f4141dae526e9792ba6dede7aa038622.tar.xz | |
Merge branch 'db/delta-applier' into db/text-delta
* db/delta-applier:
vcs-svn: let deltas use data from preimage
vcs-svn: let deltas use data from postimage
vcs-svn: verify that deltas consume all inline data
vcs-svn: implement copyfrom_data delta instruction
vcs-svn: read instructions from deltas
vcs-svn: read inline data from deltas
vcs-svn: read the preimage when applying deltas
vcs-svn: parse svndiff0 window header
vcs-svn: skeleton of an svn delta parser
vcs-svn: make buffer_read_binary API more convenient
vcs-svn: learn to maintain a sliding view of a file
Makefile: list one vcs-svn/xdiff object or header per line
Conflicts:
Makefile
vcs-svn/LICENSE
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions