mirror of
https://chromium.googlesource.com/chromium/tools/depot_tools.git
synced 2026-01-11 10:41:31 +00:00
ff84560ede
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 lines
293 B
Bash
Executable File
9 lines
293 B
Bash
Executable File
#!/usr/bin/env bash
|
|
# Copyright 2016 The Chromium Authors. All rights reserved.
|
|
# Use of this source code is governed by a BSD-style license that can be
|
|
# found in the LICENSE file.
|
|
|
|
base_dir=$(dirname "$0")
|
|
|
|
PYTHONDONTWRITEBYTECODE=1 exec python "$base_dir/clang_format_merge_driver.py" "$@"
|