[EDIT] FILE: diff3

CANCEL