r206157 - Format code around VCS conflict markers.

[Justin Bogner]

Manuel Klimek <klimek at google.com> writes:
> Author: klimek
> Date: Mon Apr 14 04:14:11 2014
> New Revision: 206157
>
> URL: http://llvm.org/viewvc/llvm-project?rev=206157&view=revLog:
> 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);
>     }
>   }

This is pretty cool, but... why bother? When is this useful?