#ediff

E | M

	E
	ediff
	M
	Managing Changes with ediff