summaryrefslogtreecommitdiff
path: root/git-merge-resolve.sh
diff options
context:
space:
mode:
authorLibravatar Nicolas Pitre <nico@cam.org>2006-04-26 23:58:00 -0400
committerLibravatar Junio C Hamano <junkio@cox.net>2006-04-26 21:23:03 -0700
commitf6c7081aa97aa67baa06390a1ef36088c33bf010 (patch)
tree1fe6559d8ae3f394b9c448139aaba5d59449b70d /git-merge-resolve.sh
parentsplit the diff-delta interface (diff)
downloadtgif-f6c7081aa97aa67baa06390a1ef36088c33bf010.tar.xz
use delta index data when finding best delta matches
This patch allows for computing the delta index for each base object only once and reuse it when trying to find the best delta match. This should set the mark and pave the way for possibly better delta generator algorithms. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions