- Committer: Vincent Ladeuil
- Date: 2010-02-10 15:46:03 UTC
- mfrom: (4985.3.21 update)
- Revision ID: v.ladeuil+lp@free.fr-20100210154603-k4no1gvfuqpzrw7p
Update performs two merges in a more logical order but stop on conflicts
| Filename | Latest Rev | Last Changed | Committer | Comment | Size | ||
|---|---|---|---|---|---|---|---|
 ..
|
|||||||
serializer
|
1185.82.3 | 19 years ago | John Arbash Meinel | Working on creating a factor for serializing chang |
|
||
__init__.py |
4792.7.3 | 15 years ago | Martin | MergeDirective.from_lines claims to want an iterab | 3.5 KB |
|
|
|
apply_bundle.py |
4961.2.20 | 15 years ago | Martin Pool | Resolve conflicts with trunk | 2.9 KB |
|
|
|
bundle_data.py |
4325.3.4 | 15 years ago | Johan Walles | Merge from upstream. | 28.6 KB |
|
|
|
commands.py |
4183.7.1 | 15 years ago | Sabin Iacob | update FSF mailing address | 3.8 KB |
|
|