All Changesets
Edit Query
Hide Query

	Change	Path
	Modified	src/__phutil_library_map__.php
	Modified	src/lint/linter/ArcanistMergeConflictLinter.php
	Added	src/lint/linter/__tests__/ArcanistMergeConflictLinterTestCase.php
	Added	src/lint/linter/__tests__/mergeconflict/mergeconflict.lint-test

All ChangesetsEdit QueryHide Query