1f51a89d39
These were ignored by git accidentally. We want ALL OF THEM since they all came in the llvm/clang source distribution.
18 lines
210 B
C++
18 lines
210 B
C++
// Merge success
|
|
namespace N1 {
|
|
int x;
|
|
}
|
|
|
|
// Merge multiple namespaces
|
|
namespace N2 {
|
|
extern int x;
|
|
}
|
|
namespace N2 {
|
|
extern float y;
|
|
}
|
|
|
|
// Merge namespace with conflict
|
|
namespace N3 {
|
|
extern float z;
|
|
}
|