transplant a conflicting changeset you end up with at least one .rej, then you have to fix the conflict manually, run transplant -c and remove the .rej files. Using this extension a merge conflict fires up your configured merge tool, you can fix the conflict and obtain a clean repo. Stefano