To get this branch, use:
bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
Viewing all changes in revision 833.
- Committer: Martin Pool
- Date: 2005-07-05 10:14:37 UTC
- Revision ID: mbp@sourcefrog.net-20050705101437-c41d1d0170905106
- don't sync up on blank or hash-only lines
- files modified:
- bzrlib/merge3.py
expand all
collapse all
added
removed
