From 756959c1efa929110fc3bf0da8262fcea580e049 Mon Sep 17 00:00:00 2001
From: Peter Wippermann <PeterWippermann@users.noreply.github.com>
Date: Sun, 18 Sep 2016 09:29:23 +0200
Subject: [PATCH] Document encoding, line delimiters, and formatting in style
 guide

Pull request: #1352
---
 CODING_STYLE.txt | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CODING_STYLE.txt b/CODING_STYLE.txt
index 3ceb3637c3b8..fefecdd26f83 100644
--- a/CODING_STYLE.txt
+++ b/CODING_STYLE.txt
@@ -1,5 +1,9 @@
 JUnit project uses the Google Java Style (https://github.com/google/styleguide) for all new
 code (under org.junit.*). Deviating from this, indentation is 4 spaces instead of 2.
 
+Be sure to set text file encoding to UTF-8 and line delimiters to UNIX style.
+
+Since not all code has been formatted yet, please format only code lines you changed to avoid extraneous changes.
+
 Legacy code (under junit.*) used the legacy guide specified in LEGACY_CODING_STYLE.txt in the
 project root.