To get this branch, use:
bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
Viewing all changes in revision 6543.2.4.
- Committer: Martin Packman
- Date: 2012-07-27 17:48:20 UTC
- mto: (7290.25.1 resolve-auto-refactor)
- mto: This revision was merged to the branch mainline in revision 7351.
- Revision ID: martin.packman@canonical.com-20120727174820-jzqpwxc4t02gkx03
Note issue over looking for conflict markers in a removed file
- files modified:
- bzrlib/conflicts.py
expand all
collapse all
added
removed
