DIFF_NEW_NAME     947 builtin/apply.c 			die((side == DIFF_NEW_NAME) ?
DIFF_NEW_NAME     975 builtin/apply.c 					      DIFF_NEW_NAME);