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

Fix merge

Browse source
This commit is contained in:
Bernat Borràs Civil 2025-04-11 16:57:19 +02:00
parent f8faf1ba26
commit 99267b1ba7
1 changed files with 0 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/ViewModels/CommitDetail.cs
View file

@ -919,11 +919,7 @@ namespace SourceGit.ViewModels
private CancellationTokenSource _cancellationSource = null;
private List<string> _revisionFiles = null;
private string _revisionFileSearchFilter = string.Empty;
<<<<<<< HEAD
private bool _isRevisionFileSearchSuggestionOpen = false;
private Dictionary<string, (int added, int removed)> _lineCountCache = new Dictionary<string, (int added, int removed)>();
=======
private List<string> _revisionFileSearchSuggestion = null;
>>>>>>> develop
}
}