summaryrefslogtreecommitdiff
path: root/contrib/diff-highlight
diff options
context:
space:
mode:
authorFelipe Contreras <felipe.contreras@gmail.com>2013-04-30 20:09:59 -0500
committerJunio C Hamano <gitster@pobox.com>2013-04-30 22:06:47 -0700
commitb25df87fad2b12349a55146d5c87625109a58221 (patch)
treed406fb7a111bd80b0fa22951a8dad4edef7dbb33 /contrib/diff-highlight
parent38e7167e9bdc57262c7298912c4bf9df4d68f6fe (diff)
downloadgit-b25df87fad2b12349a55146d5c87625109a58221.tar.gz
remote-bzr: fix partially pushed merge
If part of the merge was already pushed, we don't have the blob_marks available, however, the commits are already stored in bazaar, so we can use the revision_tree to fetch the contents. We want to do this only when there's no other option. There's no easy way to test this. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'contrib/diff-highlight')
0 files changed, 0 insertions, 0 deletions