Viewing all changes in revision 828.
- Committer: Martin Pool
- Date: 2005-07-05 08:37:09 UTC
- Revision ID: mbp@sourcefrog.net-20050705083709-8a5107dea678b14a
- code to represent merges in regular text conflict form
- files modified:
- bzrlib/merge3.py
expand all
collapse all
added
removed
