github-mirrors/sourcegit
1
0
Fork 0
mirror of https://fastgit.cc/github.com/sourcegit-scm/sourcegit synced 2026-04-22 05:40:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

ux: show conflict sources when it comes from a stash or patch (#1067)

Browse Source 
Signed-off-by: leo <longshuang@msn.cn>
This commit is contained in:
leo
2025-03-10 10:22:49 +08:00
parent bfc3f37e47
commit 855466686d
2 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/ViewModels/Conflict.cs
View File

@@ -49,6 +49,11 @@
Theirs = merge.Source;
Mine = repo.CurrentBranch;
}
else
{
Theirs = "Stash or Patch";
Mine = repo.CurrentBranch;
}
}
public void UseTheirs()