[PATCH] git-merge-one-file-script: do not misinterpret rm failure.