MFC r310872, r310874
r310872: Make sdiff --left-column work as expected
r310874: Remove extra entries from the option enum