Commit Graph

2 Commits (018e46c03d62b67aa881bc44a9346daa2771ca8d)

Author SHA1 Message Date
Josip Sokcevic 3912091152 Use py3 for remaining tools in depot_tools path
R=apolito@google.com, dpranke@google.com

Bug: 1199102
Change-Id: I06ff344ac91464eb558e92598c87e43ecfa830dc
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2994488
Auto-Submit: Josip Sokcevic <sokcevic@google.com>
Commit-Queue: Dirk Pranke <dpranke@google.com>
Reviewed-by: Anthony Polito <apolito@google.com>
Reviewed-by: Dirk Pranke <dpranke@google.com>
4 years ago
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