buildbot failure in LLVM on lldb-x86_64-linux

I'd like to fix this, but for some reason, I can't commit to LLDB right now:

Merge conflict during commit: File or directory 'source/Interpreter/OptionValueFileSpec.cpp' is out of date; try updating: resource out of date; try updating at /usr/libexec/git-core/git-svn line 595

Can someone commit this patch for me? Thanks.

Chip

0001-Core-Fix-non-Darwin-build.patch (712 Bytes)