- Committer: Canonical.com Patch Queue Manager
- Date: 2011-07-07 10:56:19 UTC
- mfrom: (6011.2.1 trunk)
- Revision ID: pqm@pqm.ubuntu.com-20110707105619-6tftefqyt2zlmho5
(vila) Merging unrelated trees prefers THIS root (Aaron Bentley)
| Filename | Latest Rev | Last Changed | Committer | Comment | Size | ||
|---|---|---|---|---|---|---|---|
 ..
|
|||||||
__init__.py |
0.39.1 | 13 years ago | Andrew Bennetts | Prototype of fancier logic, and start of some test | 1001 bytes |
|
|
|
test_changelog_merge.py |
5851.1.1 | 13 years ago | Andrew Bennetts | Fix 'not_applicable' return in ChangeLogMerger.mer | 7.1 KB |
|
|