Viewing all changes in revision 1172.
- Committer: Martin Pool
- Date: 2005-09-01 12:59:42 UTC
- Revision ID: mbp@sourcefrog.net-20050901125942-25443d6a887b9fab
- better explanation when merge fails with AmbiguousBase
- files modified:
- bzrlib/builtins.py
expand all
collapse all
added
removed
