cherry-pick/revert: add scissors line on merge conflict
[git] / t / t4018 / cpp-union-definition
1 union RIGHT {
2         double v;
3         int ChangeMe;
4 };