Changeset View

Standalone View

				24d
				16a
				\|\|\|\|\|\|\| long-o.txt
				This line is different in yours and mine, but the different in each
				=======
				Lint: Unresolved merge conflict Inline Actions This syntax indicates there is an unresolved merge conflict. Lint: Unresolved merge conflict: This syntax indicates there is an unresolved merge conflict.
				This line is different in yours and mine, but the best in yours
				>>>>>>> long-y.txt
				.
				15a
				<<<<<<< long-m.txt
				.
				11a
				>>>>>>> long-y.txt
				.
				10a
				<<<<<<< long-o.txt
				This line is different in yours and mine, but the same
				=======
				Lint: Unresolved merge conflict Inline Actions This syntax indicates there is an unresolved merge conflict. Lint: Unresolved merge conflict: This syntax indicates there is an unresolved merge conflict.
				.
				8c
				This line is different in yours, much butter
				.