Viewing all changes in revision 6388.1.2.
- Committer: Jelmer Vernooij
- Date: 2011-12-20 11:45:12 UTC
- mto: This revision was merged to the branch mainline in revision 6389.
- Revision ID: jelmer@canonical.com-20111220114512-pv8tky280njon4xv
Fix formatting.
- files modified:
- bzrlib/merge.py
expand all
collapse all
added
removed
