Viewing all changes in revision 5816.5.5.
- Committer: Jelmer Vernooij
- Date: 2011-05-04 22:38:14 UTC
- mto: This revision was merged to the branch mainline in revision 5830.
- Revision ID: jelmer@samba.org-20110504223814-dupgsdcstqj3tl76
Fix conflict handling for wt2.
- files modified:
- bzrlib/plugins/weave_fmt/workingtree.py
expand all
collapse all
added
removed
