diff options
| author |  Jonathan Nieder <jrnieder@gmail.com> | 2011-06-15 02:31:35 -0500 |
|---|---|---|
| committer | Jonathan Nieder <jrnieder@gmail.com> | 2011-06-15 02:31:35 -0500 |
| commit | 157415a9a9589a1e8af28e68c6664d39c34877af (patch) | |
| tree | f5595412452445a4393543bcb89a2f2620f83e79 /Documentation/git-mergetool.txt | |
| parent | vcs-svn: implement text-delta handling (diff) | |
| parent | vcs-svn: cap number of bytes read from sliding view (diff) | |
| download | tgif-157415a9a9589a1e8af28e68c6664d39c34877af.tar.xz | |
Merge branch 'db/delta-applier' into db/text-delta
* 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
Diffstat (limited to 'Documentation/git-mergetool.txt')
0 files changed, 0 insertions, 0 deletions