Skip to content
  • Kai Willadsen's avatar
    Add Previous/Next Conflict actions (closes bgo#602873) · dda37c05
    Kai Willadsen authored
    This patch adds two new actions that complement the existing
    chunk-skipping actions with conflict-specific previous/next actions.
    
    Differ: Add and maintain a list of chunk IDs of conflicts
    FileDiff: Implement Previous/Next Conflict actions, add a signal for
              sensitivity setting, and maintain the cursor's conflict fields
    CursorDetails: Add fields for previous and next conflict
    dda37c05