dearwolf/sourcegit
1
0
Fork 0
mirror of https://github.com/sourcegit-scm/sourcegit synced 2025-05-25 06:04:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Add button for running external mergetool on ALL conflicts (#1173)

Browse source 
* Make a few non-translated strings localizable (in Conflict view)

* Add button and wiring to run mergetool on all conflicts

* Corrected spelling and wording in related code and exception msg
This commit is contained in:
Göran W 2025-04-11 03:33:07 +02:00 • committed by GitHub
parent 3b18ee0b37
commit 47824dc27a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 48 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/Views/ChangeStatusIcon.cs
View file

@ -93,7 +93,7 @@ namespace SourceGit.Views
string indicator;
if (IsUnstagedChange)
{
if (Change.IsConflit)
if (Change.IsConflict)
{
background = Brushes.OrangeRed;
indicator = "!";
@ -139,7 +139,7 @@ namespace SourceGit.Views
}
if (isUnstaged)
ToolTip.SetTip(this, c.IsConflit ? "Conflict" : TIPS[(int)c.WorkTree]);
ToolTip.SetTip(this, c.IsConflict ? "Conflict" : TIPS[(int)c.WorkTree]);
else
ToolTip.SetTip(this, TIPS[(int)c.Index]);