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

feature<MergeTool>: supports to use WinMerge as git.mergetool

Browse source
This commit is contained in:
leo 2021-05-28 20:49:43 +08:00
parent e5ac504134
commit 11420ee5b4
3 changed files with 20 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/Commands/Command.cs
View file

@ -42,6 +42,11 @@ namespace SourceGit.Commands {
/// </summary>
public string Args { get; set; } = "";
/// <summary>
/// 是否忽略错误
/// </summary>
public bool DontRaiseError { get; set; } = false;
/// <summary>
/// 使用标准错误输出
/// </summary>
@ -115,7 +120,7 @@ namespace SourceGit.Commands {
proc.Close();
if (!isCancelled && exitCode != 0 && errs.Count > 0) {
Models.Exception.Raise(string.Join("\n", errs));
if (!DontRaiseError) Models.Exception.Raise(string.Join("\n", errs));
return false;
} else {
return true;