Index: clang_format_merge_driver |
diff --git a/clang_format_merge_driver b/clang_format_merge_driver |
new file mode 100755 |
index 0000000000000000000000000000000000000000..8b79049469ca357d2c06571f7ce296481e7b295e |
--- /dev/null |
+++ b/clang_format_merge_driver |
@@ -0,0 +1,8 @@ |
+#!/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" "$@" |