Merge pull request #229 from smashwilson/three-way

Refactor the Conflict parser.
smashwilson · Apr 25, 2016 · eef69a0 · eef69a0
2 parents 7d91ad5 + ae70931
commit eef69a0
Show file tree

Hide file tree

Showing 6 changed files with 432 additions and 263 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.4.1
+
+- Rewrite the Conflict parser as a proper recursive descent parser. [#229](https://github.com/smashwilson/merge-conflicts/pull/229)
+
 ## 1.4.0
 
 - Handle three-way merge markers. [#219](https://github.com/smashwilson/merge-conflicts/pull/219)

diff --git a/lib/conflict.coffee b/lib/conflict.coffee