mirror of
https://github.com/SpartanJ/eepp.git
synced 2026-10-01 10:40:20 +03:00
- add Discard actions for conflicted files and conflict groups - restore discarded conflicts from HEAD in both index and working tree - restrict regular discard actions to changed tracked files - preserve default editor commands when replacing an editor document - enable copying from the read-only merge-view side panels - cover conflict restoration and merge-side copying - document build parallelism and function-spacing conventions