| commit | 1e8783d1c5fccb2a62fe8449dc243f091d5c9d87 | |
| author | Thomas Leonard <talex5@gmail.com> | |
| Sun, 18 Sep 2011 10:34:04 +0000 (18 11:34 +0100) | ||
| committer | Thomas Leonard <talex5@gmail.com> | |
| Sun, 18 Sep 2011 10:34:04 +0000 (18 11:34 +0100) | ||
| tree | 339357c361c06f48a8e39d83e75e59bef6b84f81 | treesnapshot (tar.gz zip) |
| parent | 960fd45433f59436bbf67229fa3b90a74e0b5f25 | commitdiff |
Fixed merge algorithm for <command> elements
It was assuming that the parent group's <command> would override the child's
one, when it should be the other way around.
It was assuming that the parent group's <command> would override the child's
one, when it should be the other way around.
| merge.py | diffblobblamehistory | |
| tests/testlocal.py | diffblobblamehistory | |
| tests/zeroinstall-injector-1.3.xml | [new file with mode: 0644] | blob |