Usage:
axp tree star-merge-undo
[star-merge args and options] version
Infoline:
Options:
| -h, --help | display this help message and exit |
| -R, --revision REV | fetch REV first as tmp tree or new DIR |
| -d, --dir DIR | cd to DIR first |
| --test | do not actually perform commands |
| -v, --verbose | be more verbose |
| -q, --quiet | be quiet |
| -A, --archive ARCHIVE | override tree archive |
| -r, --reference VERSION | set reference version |
| -N, --forward | pass the --forward option to 'patch' |
| -t, --three-way | perform a 3-way (diff3-style) merge |
Undo changes done by the previous star-merge. Note, it only makes sense to issue star-merge-undo with the same parameters as the actual last star-merge. All other usages may produce unpredictable results. The --archive, --reference, --forward, --three-way and --dir options as well as the version are passed to star-merge. The potential errors in the intermediate process should be handled properly.