[PATCH] cpp11-migrate: Header change application tool - migmerge

[Edwin Vane]

Hi tareqsiraj, arielbernal, Sarcasm, klimek,

Introducing new tool 'migmerge' to merge and apply changes to headers as
found in header change description files generated by the C++11 Migrator.

CMake files updated to build new tool.

Includes a conflict test case.

http://llvm-reviews.chandlerc.com/D1382

Files:
  cpp11-migrate/Core/ApplyChangeDescriptions.cpp
  cpp11-migrate/Core/ApplyChangeDescriptions.h
  cpp11-migrate/Core/CMakeLists.txt
  cpp11-migrate/tool/CMakeLists.txt
  cpp11-migrate/tool/MergeMain.cpp
  test/CMakeLists.txt
  test/migmerge/conflict.cpp
  test/migmerge/conflict/common.h
  test/migmerge/conflict/expected.txt
  test/migmerge/conflict/file1.yaml
  test/migmerge/conflict/file2.yaml
  test/migmerge/conflict/file3.yaml
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D1382.1.patch
Type: text/x-patch
Size: 12031 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20130813/7a5ff942/attachment.bin>