summaryrefslogtreecommitdiff
path: root/git-mergetool.sh
diff options
context:
space:
mode:
authorLibravatar Jonathan Nieder <jrnieder@gmail.com>2011-06-15 06:17:14 -0500
committerLibravatar Jonathan Nieder <jrnieder@gmail.com>2011-06-15 06:17:14 -0500
commite09ab7d936870d57d2219bd70d96faa51805c042 (patch)
treea8a247ae4053480219c6c2dad47c9466a888c0f0 /git-mergetool.sh
parentMerge branch 'db/delta-applier' into svn-fe (diff)
parentvcs-svn: avoid hangs from corrupt deltas (diff)
downloadtgif-e09ab7d936870d57d2219bd70d96faa51805c042.tar.xz
Merge branch 'db/text-delta' into svn-fe
* db/text-delta: vcs-svn: avoid hangs from corrupt deltas vcs-svn: guard against overflow when computing preimage length vcs-svn: implement text-delta handling
Diffstat (limited to 'git-mergetool.sh')
0 files changed, 0 insertions, 0 deletions