Conflict resolution progress does not update if you hand-resolve a conflict

[smashwilson]

Prerequisites

• Have you tried to reproduce the problem in Safe Mode?
• Have you followed all applicable steps in the debugging guide?
• Have you checked the FAQs on the message board for common solutions?
• Have you checked that your issue isn't already filed?

Description

When editing a file containing a merge conflict, the conflict resolution progress is updated when you resolve conflicts through the resolve menu or keybindings, but not if you delete the conflict marker manually.

Steps to Reproduce

1. Open a file containing a merge conflict (and some surrounding context).
2. Make a selection surrounding the decorated conflict area.
3. Press "delete".

Expected behavior:

The conflict marker decorations should disappear and the resolution progress in the Git tab should advance by one.

Actual behavior:

The conflict marker decorations remain and the resolution progress does not update.

Reproduces how often:

100%

Versions

Git Packages (1) /Users/smashwilson/.atom/packages
└── github@0.24.0 (atom/github#4786390d)

Additional Information