Viewing all changes in revision 6437.63.10.
- Committer: Patch Queue Manager
- Date: 2013-05-23 09:23:09 UTC
- mfrom: (6437.75.2 2.5-merges-2.4)
- mto: (6437.77.1 2.5) (6574.1.1 integration) (6576.1.4 trunk) (6578.1.1 2.6-merges-2.5)
- mto: This revision was merged to the branch mainline in revision 6575.
- Revision ID: pqm@pqm.ubuntu.com-20130523092309-qdi5fuhfpwbb3hjo
(jameinel) Merge 2.4 into 2.5,
and resolve a few conflicts wrt extract_format_string(). (John A Meinel)
and resolve a few conflicts wrt extract_format_string(). (John A Meinel)
- files modified:
- bzrlib/tests/__init__.py
expand all
collapse all
added
removed
