Viewing all changes in revision 5988.2.2.
- Committer: Vincent Ladeuil
- Date: 2011-06-21 22:02:33 UTC
- mto: This revision was merged to the branch mainline in revision 5995.
- Revision ID: v.ladeuil+lp@free.fr-20110621220233-fqpsdymzsoqhy064
Make it clear that we start from an empty cooked_conflicts list.
- files modified:
- bzrlib/merge.py
expand all
collapse all
added
removed
