To get this branch, use:
bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
Viewing all changes in revision 6419.
- Committer: Patch Queue Manager
- Date: 2012-01-03 16:52:03 UTC
- mfrom: (6410.1.2 bzr.dev)
- Revision ID: pqm@pqm.ubuntu.com-20120103165203-ni17x57ylfpli2j0
(jelmer) Distinguish between working tree and this tree in merge. (Jelmer
Vernooij)
Vernooij)
- files modified:
- bzrlib/merge.py
expand all
collapse all
added
removed
