Viewing all changes in revision 6082.5.9.
- Committer: Vincent Ladeuil
- Date: 2011-08-29 14:16:50 UTC
- mto: (6123.1.7 +trunk)
- mto: This revision was merged to the branch mainline in revision 6123.
- Revision ID: v.ladeuil+lp@free.fr-20110829141650-mydqd8d3mloo7dwq
Cleanup criss-cross merge confusion
- files modified:
- bzrlib/config.py
expand all
collapse all
added
removed
