Manuel Klimek 68b03049e0 Format code around VCS conflict markers. ...

Now correctly formats:
  {
    int a;
    void f() {
      callme(some(parameter1,
  <<<<<<< text by the vcs
                  parameter2),
  ||||||| text by the vcs
                  parameter2),
             parameter3,
  ======= text by the vcs
                  parameter2, parameter3),
  >>>>>>> text by the vcs
             otherparameter);
    }
  }

llvm-svn: 206157

2014-04-14 09:14:11 +00:00

42 KiB

Raw Blame History

View Raw