checkout -m: attempt merge when deletion of path was staged