| commit | 7763ab008ec100f3364d203ddc62d14f82c75877 | |
| author | Douglas Gregor <doug.gregor@gmail.com> | |
| Mon, 6 Dec 2010 18:50:56 +0000 (6 18:50 +0000) | ||
| committer | Douglas Gregor <doug.gregor@gmail.com> | |
| Mon, 6 Dec 2010 18:50:56 +0000 (6 18:50 +0000) | ||
| tree | 35f999c0217516b7fde578262b00b04e8ab50008 | treesnapshot (tar.gz zip) |
| parent | 1fcfda45182198a7507b0482ab23e6237dd72802 | commitdiff |
Use the unused merge() function, fixing an minor, unintended change I
introduced in r121023.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@121025 91177308-0d34-0410-b5e6-96231b3b80d8
introduced in r121023.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@121025 91177308-0d34-0410-b5e6-96231b3b80d8
| lib/AST/Decl.cpp | diffblobblamehistory |