diff -c/--cc: do not mistake "resolved as deletion" as "use working tree"