-
Committer:
John Arbash Meinel
-
Date:
2013-06-24 12:03:12 UTC
-
mfrom:
(6437.77.2 2.5)
-
mto:
This revision was merged to the branch mainline in
revision
6579.
-
Revision ID:
john@arbash-meinel.com-20130624120312-pmvck24x052csigx
Merge lp:bzr/2.5 r6515 to get the fix for bug #855155 (Dirstate.update_basis_by_delta)