It seems that it's no longer possible to get the names of files that were automatically resolved. Changing the error message to simply advise the user to examine the results after the merge.
I'm preparing a bit of a redesign that should make these error messages unnecessary. Instead, a future version of the client might just show the underlying git or git-annex errors, to avoid potentially obscuring what exactly is going on behind the scenes.
It seems that it's no longer possible to get the names of files that were automatically resolved. Changing the error message to simply advise the user to examine the results after the merge.
I'm preparing a bit of a redesign that should make these error messages unnecessary. Instead, a future version of the client might just show the underlying git or git-annex errors, to avoid potentially obscuring what exactly is going on behind the scenes.