Viewing all changes in revision 6516.

Committer: John Arbash Meinel
Date: 2013-05-30 11:42:30 UTC
mfrom: <a title="Merged From 6015.57.9" href="/~jameinel/bzr/2.5-merges-2.4/revision/6015.57.9">(6015.57.9 2.4)
Revision ID: john@arbash-meinel.com-20130530114230-821cc73oq682lqtd

Merge lp:bzr/2.4 @6078.

This brings in the fix for bug #855155 (Dirstate.update_basis_by_delta).

added added

removed removed

~jameinel/bzr/2.5-merges-2.4