[PATCH] Format code around VCS conflict markers.

[Manuel Klimek]

  Applied review comments.

Hi djasper,

http://reviews.llvm.org/D3355

CHANGE SINCE LAST DIFF
  http://reviews.llvm.org/D3355?vs=8477&id=8478#toc

BRANCH
  implement-conflict-markers

ARCANIST PROJECT
  clang

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.2.patch
Type: text/x-patch
Size: 9866 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20140411/d181bea7/attachment.bin>