This makes git preserve the local version, but still mark the file as conflicted, so it is not mangled with conflict regions.
