v1.4.4

• Custom repository contexts and multi-context projects. #237

v1.4.3

• Normalize paths coming from git status. #236
• Avoid overlays rendering over the MergeConflictsView. #235
• Document key binding customization in the README. #235

v1.4.2

• Rewrite the Conflict parser as a proper recursive descent parser. #229
• Register custom repository contexts to move toward support for non-git repositories. #222
• Transact resolve actions to group as single undo operations. #221

v1.4.1

• Fix hangs with broken conflict markers. #220

v1.4.0

• Handle three-way merge markers. #219
• Support for nodegit operations when available, currently in Atom Beta. #205

v1.3.7

• Resolving entire files as ours or theirs works again. #192
• Use GitUtils to stage files instead of shelling out to git. #191
• Update the method I was using to read the scrollbar width. #190

v1.3.6

• Use transparency instead of mix() to allow selection to show through. #181
• Updated the README to include how-to instructions. #178

v1.3.5

• Using the "stage" button no longer triggers a crash. #173

v1.3.4

• Scroll the merge conflicts view when many conflicts exist. #170
• Prune some dead code. #167

v1.3.3

• With multiple projects, remember the git repository that you initially detected conflicts within. #165
• Handle projects with no git repository. #164
• Improve the "Git not found" error dialog. #163
• Use alt-m instead of ctrl-m in key bindings. #162
• Use Atom's built-in notification API. #151