summaryrefslogtreecommitdiff
path: root/git-mergetool.sh
diff options
context:
space:
mode:
authorLibravatar Jonathan Nieder <jrnieder@gmail.com>2011-06-15 02:17:51 -0500
committerLibravatar Jonathan Nieder <jrnieder@gmail.com>2011-06-15 02:17:51 -0500
commita8d3d265450d8fc2c14a4bcd2f16d28d4ea0196b (patch)
tree5e83d8ad5fceb4e934838da21478adf90d5c5653 /git-mergetool.sh
parentMerge branch 'db/svn-fe-code-purge' into svn-fe (diff)
parentvcs-svn: cap number of bytes read from sliding view (diff)
downloadtgif-a8d3d265450d8fc2c14a4bcd2f16d28d4ea0196b.tar.xz
Merge branch 'db/delta-applier' into svn-fe
* db/delta-applier: vcs-svn: cap number of bytes read from sliding view test-svn-fe: split off "test-svn-fe -d" into a separate function 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 'git-mergetool.sh')
0 files changed, 0 insertions, 0 deletions