Conflict resolution popup messages should include the file name in the message rather than just 'this file'.

[peterhal]

The text in ResolverView just says 'this file'. It'd be helpful to see the file name in the message as the message doesn't go away when the user switches tabs so 'this file' may not reflect the file of the currently open tab.

[smashwilson]

👋 Thanks for taking the time to file an issue here! Unfortunately, this repository is being deprecated, so I won't be getting to this one here.

I don't think this applies to the new git and GitHub package for Atom. If you see something similar, please file an issue there to let us know. Thanks 🙇