summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGES.txt3
1 files changed, 3 insertions, 0 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index 1caba39..78d0c49 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -38,6 +38,9 @@ Changes:
* Allow trailing backslash if in an inline comment. (Issue #374)
+* If ``--config`` is used, only that configuration is processed. Otherwise,
+ merge the user and local configurations are merged. (Issue #368 / #369)
+
Bug fixes:
* Don't crash if Checker.build_tokens_line() returns None. (Issue #306)