To get this branch, use:
bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
Viewing all changes in revision 4322.
- Committer: Canonical.com Patch Queue Manager
- Date: 2009-05-01 20:43:51 UTC
- mfrom: (4312.1.3 weave_conflict_delete_328171)
- Revision ID: pqm@pqm.ubuntu.com-20090501204351-ll10ketv3bu8plhx
(jam) Update 'bzr merge --weave' to generate conflicts when one side
modifies and one side deletes a line. (bug #328171)
modifies and one side deletes a line. (bug #328171)
expand all
collapse all
added
removed
