add 'debugrebuildstate' to rebuild the dirstate from a given revision
- added and removed files will be lost while recreating the dirstate
- modifications are not lost
merge: warning: conflicts during mergemerging amerging a failed!32e80765d7fe+75234512624c+ tipsomething else=======somethingM a