Viewing all changes in revision 1049.
- Committer: Martin Pool
- Date: 2005-08-05 20:17:17 UTC
- Revision ID: mbp@sourcefrog.net-20050805201717-959807d65bcd0ccd
- add better handler for new_contents_conflict collision
- files modified:
- bzrlib/merge.py
expand all
collapse all
added
removed
