To get this branch, use:
bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
Viewing all changes in revision 1907.5.13.
- Committer: Matthieu Moy
- Date: 2006-09-09 18:01:44 UTC
- mto: (2009.1.1 update-r)
- mto: This revision was merged to the branch mainline in revision 4923.
- Revision ID: Matthieu.Moy@imag.fr-20060909180144-3a3e92fbaaee00c2
Fixed bad conflict resolution.
- files modified:
- bzrlib/workingtree.py
expand all
collapse all
added
removed
