mergeconflict.lint-test
246e604a070fmaster

mergeconflict.lint-test
View Options

			{
			"foo": "bar",
			<<<<<<< HEAD
			"bar": "baz"
			=======
			"baz": "foo"
			>>>>>>> branch2
			}
			~~~~~~~~~~
			error:5:1:MERGECONFLICT1:Unresolved merge conflict