summaryrefslogtreecommitdiff
path: root/contrib/diff-highlight
diff options
context:
space:
mode:
authorLibravatar Felipe Contreras <felipe.contreras@gmail.com>2013-04-30 20:09:57 -0500
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-04-30 22:06:46 -0700
commitf38dfc4c32507de2f7cf05350fe8b34fd4edd45d (patch)
tree50fa722a7bc32ffe22409d4c00a6ec432137a4b0 /contrib/diff-highlight
parentremote-bzr: always try to update the worktree (diff)
downloadtgif-f38dfc4c32507de2f7cf05350fe8b34fd4edd45d.tar.xz
remote-bzr: add support to push merges
In order to do that, we need to store the marks of every file, so that they can be fetched when needed. Unfortunately we can't tell bazaar that nothing changed, we need to send the data so that it can figure it out by itself. And since it will be requesting a bunch of information by the file_id, it's better to have a helper dict (rev_files), so that we can fetch it quickly. 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