[PATCH] Format code around VCS conflict markers.

[Manuel Klimek]

Hi djasper,

http://reviews.llvm.org/D3355

Files:
  lib/Format/Format.cpp
  lib/Format/FormatToken.h
  lib/Format/UnwrappedLineParser.cpp
  lib/Format/UnwrappedLineParser.h
  unittests/Format/FormatTest.cpp
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D3355.1.patch
Type: text/x-patch
Size: 9744 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20140411/2cae8a77/attachment.bin>