Mercurial > hg > Members > kono > nitros9-code
comparison level2/coco3_6309/bootlists/dw.bl @ 2898:28ed72477814 lwtools-port
Dummy merge of default branch into lwtools
hg -y merge --tool=internal:fail default
hg revert --all --no-backup --rev .
hg resolve -a -m
This dummy merge discards any changes from the default branch
so that the result is the same as what lwtools already had.
When merging back to default branch later, the discarded
changes will be discarded there also, so the result
will be that the default branch will contain what
the lwtools branch had before these merges.
Only scripts/burst was "rescued" from default branch.
author | Tormod Volden <debian.tormod@gmail.com> |
---|---|
date | Sat, 11 Jan 2014 18:40:44 +0100 |
parents | 05b648103e78 dbc6d0647ac4 |
children | 7f2d56ce87c8 |
comparison
equal
deleted
inserted
replaced
2897:260116065a2f | 2898:28ed72477814 |
---|