This repository has been archived by the owner. It is now read-only.
May 16, 2017
Prepare 1.4.5 release

@smashwilson smashwilson released this Jun 7, 2016 · 11 commits to master since this release

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

@smashwilson smashwilson released this May 24, 2016 · 16 commits to master since this release

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

@smashwilson smashwilson released this Apr 25, 2016 · 24 commits to master since this release

Assets 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

@smashwilson smashwilson released this Apr 25, 2016 · 40 commits to master since this release

Assets 2
  • Fix hangs with broken conflict markers. #220

@smashwilson smashwilson released this Apr 25, 2016 · 43 commits to master since this release

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

@smashwilson smashwilson released this Apr 25, 2016 · 68 commits to master since this release

Assets 2
  • 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

@smashwilson smashwilson released this Sep 20, 2015 · 79 commits to master since this release

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

@smashwilson smashwilson released this Sep 20, 2015 · 90 commits to master since this release

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

@smashwilson smashwilson released this Jul 22, 2015 · 94 commits to master since this release

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