Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Adding breaktrace & disabling timer migration"
[kvmfornfv.git]
/
qemu
/
tests
/
qapi-schema
/
alternate-clash.err
diff --git
a/qemu/tests/qapi-schema/alternate-clash.err
b/qemu/tests/qapi-schema/alternate-clash.err
index
51bea3e
..
604d849
100644
(file)
--- a/
qemu/tests/qapi-schema/alternate-clash.err
+++ b/
qemu/tests/qapi-schema/alternate-clash.err
@@
-1
+1
@@
-tests/qapi-schema/alternate-clash.json:
2: Alternate 'Alt1' member 'ONE' clashes with 'one'
+tests/qapi-schema/alternate-clash.json:
7: 'a_b' (branch of Alt1) collides with 'a-b' (branch of Alt1)