smashwilson/merge-conflicts — pull request #33 by smashwilson (2014-03-22 22:03:48+00:00)
Title: ResolverView

Due to a bug, if you finished resolving all of the conflicts in one file, *all* open files would immediately clean up conflict controls and jump to resolution-mode. This scopes the event subscription to only do so when *that file* is done.