Show progress bars for each file.
Use absolute paths in merge-conflicts:resolve.
Merge remote-tracking branch 'origin/master' into report-progress
Er, actually use the same event.
Use a fixed width for the path <span>.

This lines up the progress bars nicely. It'll look ugly if you have a really long
filename, though.
On second thought, right-justify that junk.
Pass the resolved count in merge-conflicts:resolved.

Make it easier for subscribers to be stateless.
Let's put the .gif in the repository.

It'll be easier to update and show on pending PRs this way.
Use a relative link for the demonstration .gif.

Add a section for documenting the events that this package broadcasts.
Merge pull request #5 from smashwilson/report-progress

Report merge progress
Another feature done.
Prepare 0.0.4 release
Prepare 0.0.5 release
Noooo my animated gif!
Prepare 0.0.6 release
Refactor some ConflictMarker specs.
Fetch the "active" conflict(s) on request.
merge-conflicts:resolve-current

When emitted, this event resolves all active conflicts in favor of the side that
you have a cursor in. It skips conflicts if you have cursors in *both* sides.
Use editor commands to accept merge results.
Jump to the next or previous conflict markers.