merge-recursive: adjust to loosened "working file clobbered" check