Merge topic 'clang-format-source'

d9fd2f54 Revise C++ coding style using clang-format
82df6dea Empty commit at end of history preceding clang-format style transition
6a13f43f CONTRIBUTING: Add a section on coding style
bf451d9f Add a script to run clang-format on the entire source tree
1e90d78f Configure clang-format for CMake source tree
da60adc3 Tell Git to use a distinct conflict marker size in `.rst` files

3 files changed, 6 insertions, 6 deletions

diff --git a/Tests/GhsMultiDuplicateSourceFilenames/main.c b/Tests/GhsMultiDuplicateSourceFilenames/main.c
index 2779d68..301a32e 100644
--- a/Tests/GhsMultiDuplicateSourceFilenames/main.c
+++ b/Tests/GhsMultiDuplicateSourceFilenames/main.c
@@ -1,9 +1,9 @@
 int test_a(void);
 int test_b(void);
 
-int main(int argc, char *argv[])
+int main(int argc, char* argv[])
 {
-    test_a();
-    test_b();
-    return 0;
+  test_a();
+  test_b();
+  return 0;
 }
diff --git a/Tests/GhsMultiDuplicateSourceFilenames/subfolder/test.c b/Tests/GhsMultiDuplicateSourceFilenames/subfolder/test.c
index e1372b9..e1e1759 100644
--- a/Tests/GhsMultiDuplicateSourceFilenames/subfolder/test.c
+++ b/Tests/GhsMultiDuplicateSourceFilenames/subfolder/test.c
@@ -1,5 +1,5 @@
 
 int test_b()
 {
-    return 2;
+  return 2;
 }
diff --git a/Tests/GhsMultiDuplicateSourceFilenames/test.c b/Tests/GhsMultiDuplicateSourceFilenames/test.c
index 60286dd..5ffcbdf 100644
--- a/Tests/GhsMultiDuplicateSourceFilenames/test.c
+++ b/Tests/GhsMultiDuplicateSourceFilenames/test.c
@@ -1,5 +1,5 @@
 
 int test_a()
 {
-    return 1;
+  return 1;
 }