Applied sublain-log-ediff patch of Pio Leong <pio.leong@gmail.com>.
* Simplified sublain-ediff.