Show essence of merge conflict
Registered by
Maxim Petrov
Before this (in version 0.8.0 and earlier) there is only conflicted files list in In/Out panel. This feature will show (in two-panel mode, like Diff panel) what parts of file exactly conflicted.
Blueprint information
- Status:
- Complete
- Approver:
- Maxim Petrov
- Priority:
- High
- Drafter:
- Maxim Petrov
- Direction:
- Approved
- Assignee:
- Maxim Petrov
- Definition:
- Approved
- Series goal:
- Accepted for trunk
- Implementation:
-
Implemented
- Milestone target:
-
0.9.0
- Started by
- Maxim Petrov
- Completed by
- Maxim Petrov
Whiteboard
(?)
