« back to all changes in this revision
Viewing changes to bzrlib/merge.py
- Committer: Martin Packman
- Date: 2011-09-28 16:50:40 UTC
- mfrom: (6015.37.6 2.4_overflow_pack_stat_683191_706957)
- mto: This revision was merged to the branch mainline in revision 6177.
- Revision ID: martin.packman@canonical.com-20110928165040-82z3e64y21ube471
Merge fix for overflow issues in pack_stat from 2.4
added
removed
bzrlib/merge.py
