| commit | 89d63e5e4f4423455f7ee6b1e85143c34d088128 | [log] [tgz] |
|---|---|---|
| author | Douglas Gregor <dgregor@apple.com> | Mon Dec 06 18:50:56 2010 +0000 |
| committer | Douglas Gregor <dgregor@apple.com> | Mon Dec 06 18:50:56 2010 +0000 |
| tree | 35f999c0217516b7fde578262b00b04e8ab50008 | |
| parent | 381d34e0b205ca27bcc7e7c1652561941c437965 [diff] |
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