This is an archive of the discontinued Mercurial Phabricator instance.

	continue: hg rebase --continue			continue: hg rebase --continue
	$ hg rebase --continue			$ hg rebase --continue
	rebasing 1:fdaca8533b86 "b"			rebasing 1:fdaca8533b86 "b"
	note: rebase of 1:fdaca8533b86 created no changes to commit			note: rebase of 1:fdaca8533b86 created no changes to commit
	saved backup bundle to $TESTTMP/repo/.hg/strip-backup/fdaca8533b86-7fd70513-rebase.hg			saved backup bundle to $TESTTMP/repo/.hg/strip-backup/fdaca8533b86-7fd70513-rebase.hg
	$ hg resolve --list			$ hg resolve --list
	$ test -d .hg/merge			$ test -d .hg/merge
	[1]			[1]
				Now try again with --collapse
				$ hg unbundle -q .hg/strip-backup/fdaca8533b86-7fd70513-rebase.hg
				$ hg rebase -s 2 -d 1 --noninteractive --collapse
				rebasing 2:fdaca8533b86 "b" (tip)
				merging a
				warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
				unresolved conflicts (see hg resolve, then hg rebase --continue)
				[1]
				$ echo a > a
				$ echo c >> a
				$ hg resolve --mark a
				(no more unresolved files)
				continue: hg rebase --continue
				$ hg rebase --continue
				rebasing 2:fdaca8533b86 "b" (tip)
				saved backup bundle to $TESTTMP/repo/.hg/strip-backup/fdaca8533b86-7fd70513-rebase.hg
				BROKEN: the merge state was not cleared
				$ hg resolve --list
				R a
				$ test -d .hg/merge

tests: add test for issue 5494 but with --collapseClosedPublic