tests/test-rebuildstate.t

merge: make merge.preferancestor type and default consistent

(and mark it)

basic test for hg debugrebuildstate

  $ hg init repo
  $ cd repo

  $ touch foo bar
  $ hg ci -Am 'add foo bar'
  adding bar
  adding foo

  $ touch baz
  $ hg add baz
  $ hg rm bar

  $ hg debugrebuildstate

state dump after

  $ hg debugstate --nodates | sort
  n 644         -1 set                 bar
  n 644         -1 set                 foo

status

  $ hg st -A
  ! bar
  ? baz
  C foo

  $ cd ..