http://llvm.org/bugs/show_bug.cgi?id=5238
Summary: Clang should recognize merge conflicts
Product: clang
Version: unspecified
Platform: PC
OS/Version: All
Status: NEW
Severity: normal
Priority: P2
Component: parser
AssignedTo: [email protected]
ReportedBy: [email protected]
CC: [email protected]
It would cool if clang recognized merge conflicts in source code:
--
ddun...@giles:tmp$ cat t.c
void f0() {
<<<<<<< HEAD
int x;
=======
int y;
>>>>>>> whatever
}
ddun...@giles:tmp$ clang -c t.c
t.c:2:1: error: expected expression
<<<<<<< HEAD
^
t.c:4:1: error: expected expression
=======
^
t.c:6:1: error: expected expression
>>>>>>> whatever
^
3 diagnostics generated.
ddun...@giles:tmp$
--
Doesn't have to be fancy, although actually choosing to give an error and then
only parse one side of the conflict might be good for error recovery purposes.
--
Configure bugmail: http://llvm.org/bugs/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are on the CC list for the bug.
_______________________________________________
LLVMbugs mailing list
[email protected]
http://lists.cs.uiuc.edu/mailman/listinfo/llvmbugs
