This is an archive of the discontinued Mercurial Phabricator instance.

Status	Author	Revision
Closed	martinvonz	D12085 relnotes: add note about changed labels texts
Closed	martinvonz	D12025 graft: attempt to make merge labels more helpful
Closed	martinvonz	D12024 shelve: attempt to make merge labels more helpful
Closed	martinvonz	D12023 histedit: attempt to make merge labels more helpful
Closed	martinvonz	D12022 update: set custom conflict label for base commit
Closed	martinvonz	D12021 merge: set custom conflict label for base commit
Closed	martinvonz	D12020 rebase: set custom conflict label for base commit
Closed	martinvonz	D12019 simplemerge: take over formatting of label from `filemerge`
Closed	martinvonz	D12018 filemerge: pass `simplemerge.MergeInput` to tool functions
Closed	martinvonz	D12017 filemerge: work with `simplemerge.MergeInput` in `filemerge()`
Closed	martinvonz	D12016 filemerge: always define a "base" label
Closed	martinvonz	D12015 filemerge: set default labels a little earlier
Closed	martinvonz	D12014 filemerge: remove unused arguments from `_merge()`
Closed	martinvonz	D12013 simplemerge: take arguments as annotated context objects
Closed	martinvonz	D12012 filemerge: make `labels` a required arg for `_premerge()`
Closed	martinvonz	D12011 filemerge: remove unnecessary check for empty string
Closed	martinvonz	D12010 tests: also test spaces in conflict marker labels

Diff 31839

	for subrepositories.			for subrepositories.

	The labels passed to merge tools have changed slightly. Merge tools can get			The labels passed to merge tools have changed slightly. Merge tools can get
	labels passed to them if you include `$labellocal`, `$labelbase`, and/or			labels passed to them if you include `$labellocal`, `$labelbase`, and/or
	`$labelother` in the `merge-tool.<tool name>.args` configuration. These labels			`$labelother` in the `merge-tool.<tool name>.args` configuration. These labels
	used to have some space-padding, and truncation to fit within 72 columns. Both			used to have some space-padding, and truncation to fit within 72 columns. Both
	the padding and the truncation has been removed.			the padding and the truncation has been removed.

				Some of the text in labels passed to merge tools has changed. For example,
				in conflicts while running `hg histedit`, the labels used to be "local",
				"base", and "histedit". They are now "already edited",
				"parent of current change", and "current change", respectively.

	== Internal API Changes ==			== Internal API Changes ==

	The following functions have been removed:			The following functions have been removed:

	Miscellaneous:			Miscellaneous: