[PATCH] Format code around VCS conflict markers.

[Daniel Jasper]

  Still looks good.


================
Comment at: lib/Format/UnwrappedLineParser.h:111-114
@@ +110,6 @@
+
+  // Marks a conditional compilation edge (for example, an '#if', '#ifdef',
+  // '#else' or merge conflict marker). If 'Unreachable' is true, assumes
+  // this branch either cannot be taken (for example '#if false'), or should
+  // not be taken in this round.
+  void conditionalCompilationCondition(bool Unreachable);
----------------
According to this comment, 'unreachable' does not seem like quite the right word. May "Active" or "ProcessBranch"?


http://reviews.llvm.org/D3355

BRANCH
  implement-conflict-markers

ARCANIST PROJECT
  clang