Bug #229
"In Conflict" description says "Select a file..." but no selection necessary?
| Status: | Closed | Start date: | 2011-07-27 | |
|---|---|---|---|---|
| Priority: | Normal | Due date: | ||
| Assignee: |  Chris Cannam | % Done: | 100% | |
| Category: | - | |||
| Target version: | 1.0 |
Description
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?
History
#1
Updated by Chris Cannam over 12 years ago
- Priority changed from Normal to High
#2
Updated by Chris Cannam over 12 years ago
- Priority changed from High to Normal
#3
Updated by Chris Cannam over 12 years ago
- Target version set to 1.0
#4
Updated by Chris Cannam over 12 years ago
- Description updated (diff)
- Status changed from New to Closed
- % Done changed from 0 to 100
Fixed in c6ea3eb00635