This is an archive of the discontinued Mercurial Phabricator instance.

Status	Author	Revision
Closed	ryanmce	D827 fbamend: fix typo and shorten advice
Abandoned	ryanmce	D826 tests: more information added to obsmarkers
Closed	ryanmce	D825 tests: not rebasing now prints out names
Closed	ryanmce	D824 tests: tip moved to after other names
Closed	ryanmce	D823 scm-prompt: fix single quotes showing up with no format string
Closed	ryanmce	D822 scm-prompt: update test for changed hg output

Diff 2123

	\|			\|
	\| o 775bfdddc842 c2			\| o 775bfdddc842 c2
	\|/			\|/
	o 5cad84d1726f c1			o 5cad84d1726f c1


	Test rebase			Test rebase
	$ cmd hg rebase -d 775bfdd --config "extensions.rebase="			$ cmd hg rebase -d 775bfdd --config "extensions.rebase="
	rebasing 2:4b6cc7d5194b "c3" (tip active)			rebasing 2:4b6cc7d5194b "c3" (active tip)
	merging b			merging b
	warning: conflicts while merging b! (edit, then use 'hg resolve --mark')			warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
	unresolved conflicts (see hg resolve, then hg rebase --continue)			unresolved conflicts (see hg resolve, then hg rebase --continue)
	(775bfdd\|REBASE)			(775bfdd\|REBASE)
	$ cmd hg book rebase			$ cmd hg book rebase
	(rebase\|REBASE)			(rebase\|REBASE)
	$ cmd hg rebase --abort --config "extensions.rebase="			$ cmd hg rebase --abort --config "extensions.rebase="
	rebase aborted			rebase aborted