rebase: ensure target is not taken as external (
issue3085)
This could happen in specific situations in which 'target'
was selected as external and used for p1 _and_ p2.
i18n-ru: fix translation of --logfile (
issue3095)
rebase: treat nullmerge as a special case in rebasestate (
issue3046)
When storing/restoring a nullmerge (-2), a 'standard' conversion was made
and an existing changeset was wrongly used.
Nullmerge should instead be treated as a special case.