commit 6925455ef77cd694c38cebcd92a3e4167569a1ae
author Anthony Sottile <asottile@umich.edu> Fri Aug 12 10:23:38 2016 -0700
committer Anthony Sottile <asottile@umich.edu> Fri Aug 12 10:23:38 2016 -0700
tree f20147d23978ae7d26d63ccdcc988466c1f6ace9
parent a43122c5f4a1d1dc16d9ceb66fecbaa3c1dd62b7

v0.6.0

CHANGELOG

diff --git a/CHANGELOG b/CHANGELOG
index 3654101..8978413 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,10 @@
+0.6.0
+=====
+- Merge conflict detection no longer crashes on binary files
+- Indentation in json may be an arbitrary separator
+- Editable requirements are properly sorted
+- Encoding pragma fixer pragma is configurable
+
 0.5.1
 =====
 - Add a --no-sort-keys to json pretty formatter

setup.py

diff --git a/setup.py b/setup.py
index e0478b7..e8c5000 100644
--- a/setup.py
+++ b/setup.py
@@ -6,7 +6,7 @@
     name='pre_commit_hooks',
     description='Some out-of-the-box hooks for pre-commit.',
     url='https://github.com/pre-commit/pre-commit-hooks',
-    version='0.5.1',
+    version='0.6.0',
 
     author='Anthony Sottile',
     author_email='asottile@umich.edu',