diff options
| author | Manuel Klimek <klimek@google.com> | 2014-04-14 09:14:11 +0000 |
|---|---|---|
| committer | Manuel Klimek <klimek@google.com> | 2014-04-14 09:14:11 +0000 |
| commit | 68b03049e09824094b8ff07280b8240ab438167d (patch) | |
| tree | fca344860a67d70bc4615f7c33d8e3003f0951e2 /compiler-rt | |
| parent | efc3013544ee79c43f289b92125a81470fb7bc71 (diff) | |
| download | bcm5719-llvm-68b03049e09824094b8ff07280b8240ab438167d.tar.gz bcm5719-llvm-68b03049e09824094b8ff07280b8240ab438167d.zip | |
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
Diffstat (limited to 'compiler-rt')
0 files changed, 0 insertions, 0 deletions
