Commit Graph

1 Commits (81f4ba7e7dbf7e1f8cdb37f7863ec4d7b19eb5fb)

Author SHA1 Message Date
dcheng ff84560ede Introduce git merge driver for the blink reformatting
Based on CL from primiano@: https://codereview.chromium.org/2348793003/

This is a simple tool that can help automatically resolve conflicts
from clang-format reformatting patches.

BUG=574611

Review-Url: https://codereview.chromium.org/2356933002
9 years ago