Differential D21559 Diff 125928 documentation/content/en/books/handbook/cutting-edge/_index.adoc

Changeset View

Standalone View

	Show First 20 Lines • Show All 1,024 Lines • ▼ Show 20 Lines
	[source,shell]			[source,shell]
	....			....
	# mergemaster -Ui			# mergemaster -Ui
	....			....

	If a file must be manually merged, an interactive display allows the user to choose which portions of the files are kept.			If a file must be manually merged, an interactive display allows the user to choose which portions of the files are kept.
	See man:mergemaster[8] for more information.			See man:mergemaster[8] for more information.

				If the standard [.filename]#/usr/src# was not used, another parameter must be passed to man:mergemaster[8]:

				[source,shell]
				....
				# mergemaster -Ui PATH_TO_SRC
				....

	[[updating-src-completing-check-old]]			[[updating-src-completing-check-old]]
	==== Checking for Outdated Files and Libraries			==== Checking for Outdated Files and Libraries

	Some obsolete files or directories can remain after an update.			Some obsolete files or directories can remain after an update.
	These files can be located:			These files can be located:

	[source,shell]			[source,shell]
	....			....
	▲ Show 20 Lines • Show All 96 Lines • Show Last 20 Lines