Skip to content
Commit 71a60ba4 authored by Chris Lattner's avatar Chris Lattner
Browse files

speed up conflict handling. 

llvm-svn: 33985
parent 3cc886ad
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment