Viewing all changes in revision 4869.3.31.
- Committer: Andrew Bennetts
- Date: 2010-01-18 07:58:34 UTC
- mto: (4973.1.1 integration)
- mto: This revision was merged to the branch mainline in revision 4975.
- Revision ID: andrew.bennetts@canonical.com-20100118075834-30koy8127tsf53xg
Add comment, improve doc string, remove redundant line.
- files modified:
- bzrlib/merge.py
expand all
collapse all
added
removed
