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