ediff support

Change-Id: Iec0996ca96fc3047d22991725eb08917b54e926f