merge with stable
This should correct an earlier couple of bad merges (
5433856b2558 and
596960a4ad0d, now pruned) that accidentally brought in a change that had
been marked obsolete (
244ac996a821).
$ hg init
$ echo This is file a1 > a
$ hg add a
$ hg commit -m "commit #0"
$ ls
a
$ echo This is file b1 > b
$ hg add b
$ hg commit -m "commit #1"
$ hg co 0
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
B should disappear
$ ls
a