Bug #229
Updated by Chris Cannam over 12 years ago
The heading description for the In Conflict file list says
"Select a file and use Merge to try to resolve the merge again."
But the merge is now carried out by just pressing Merge, regardless of whether you have any files selected, right?