Viewing all changes in revision 6437.78.2.
- Committer: John Arbash Meinel
- Date: 2013-05-30 11:42:30 UTC
- mfrom: (6015.57.9 2.4)
- mto: (6437.77.2 2.5)
- mto: This revision was merged to the branch mainline in revision 6579.
- 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).
This brings in the fix for bug #855155 (Dirstate.update_basis_by_delta).
expand all
collapse all
added
removed
