mirror of
https://github.com/sourcegit-scm/sourcegit.git
synced 2024-12-26 21:17:20 -08:00
96d4150d26
* remove dotnet-tool.json because the project does not rely on any dotnet tools. * remove Directory.Build.props because the solution has only one project. * move src/SourceGit to src. It's not needed to put all sources into a subfolder of src since there's only one project.
23 lines
595 B
C#
23 lines
595 B
C#
using System;
|
|
|
|
namespace SourceGit.Commands
|
|
{
|
|
public class Merge : Command
|
|
{
|
|
public Merge(string repo, string source, string mode, Action<string> outputHandler)
|
|
{
|
|
_outputHandler = outputHandler;
|
|
WorkingDirectory = repo;
|
|
Context = repo;
|
|
TraitErrorAsOutput = true;
|
|
Args = $"merge --progress {source} {mode}";
|
|
}
|
|
|
|
protected override void OnReadline(string line)
|
|
{
|
|
_outputHandler?.Invoke(line);
|
|
}
|
|
|
|
private readonly Action<string> _outputHandler = null;
|
|
}
|
|
}
|