diff docs/glossary.rst @ 285:691cb55358b0

obsolete: do not obsolete rebase --detach nullmerge revs Rebase state contains the changesets to rebase as well as 'nullmerge' entries used drive the merge strategy. These nullmerge were not rebased and should be ignored, and certainly not be marked obsolete.
author Patrick Mezard <patrick@mezard.eu>
date Wed, 20 Jun 2012 14:43:20 +0200
parents 8907a9269549
children b398e9c2dbd1
line wrap: on
line diff