mirror of
https://fastgit.cc/github.com/sourcegit-scm/sourcegit
synced 2026-04-21 13:20:30 +08:00
- Remove duplicated attributes in `Models.ConflictRegion` - Add `ViewModels.MergeConflictEditor.Resolve(object resolution)` to replace `AcceptOurs/AcceptTheirs/AcceptBothMineFirst/AcceptBothTheirsFirst/Undo` - Use command-binding instead of listening `Click` event for command buttons - Remove `IsOldSide` and `IsResult` properties since `PanelType` is enough - Rewrite the way to calculate current hovered conflict chunk Signed-off-by: leo <longshuang@msn.cn>