- 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)
| Filename | Latest Rev | Last Changed | Committer | Comment | Size | ||
|---|---|---|---|---|---|---|---|
 ..
|
|||||||
__init__.py |
4304.2.1 | 15 years ago | Vincent Ladeuil | Fix bug #367726 by reverting some default user han | 23.2 KB |
|
|
|
_gssapi.py |
4304.2.1 | 15 years ago | Vincent Ladeuil | Fix bug #367726 by reverting some default user han | 6.1 KB |
|
|