Chromium Code Reviews| Index: tools/idl_parser/test_parser/interface_web.idl |
| diff --git a/tools/idl_parser/test_parser/interface_web.idl b/tools/idl_parser/test_parser/interface_web.idl |
| index 9e69e9f12430849046edeff478539c035073f028..b1f3278623f8e4e764f5070dc8f495ff73fc1da9 100644 |
| --- a/tools/idl_parser/test_parser/interface_web.idl |
| +++ b/tools/idl_parser/test_parser/interface_web.idl |
| @@ -72,6 +72,23 @@ interface MyIFaceMissingAttribute { |
| }; |
| /* TREE |
| + *Interface(MyIFaceContainsUnresolvedConflictDiff) |
| + * Operation(foo) |
| + * Arguments() |
| + * Type() |
| + * PrimitiveType(DOMString) |
| + * Error(Unexpected "<" after ";".) |
| + */ |
| +interface MyIFaceContainsUnresolvedConflictDiff { |
| + DOMString foo(); |
| +<<<<<< ours |
|
bashi
2015/03/06 01:06:04
I use '<<<<<<' instead of '<<<<<<<' (removed one '
|
| + DOMString bar(); |
| + iterable<long>; |
| +====== |
| +>>>>>> theirs |
| +}; |
| + |
| +/* TREE |
| *Interface(MyIFaceBig) |
| * Const(setString) |
| * PrimitiveType(DOMString) |