You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
17 lines
448 B
17 lines
448 B
using EnvDTE;
|
|
|
|
namespace GitPluginShared.Commands
|
|
{
|
|
public sealed class SolveMergeConflicts : ItemCommandBase
|
|
{
|
|
protected override void OnExecute(SelectedItem item, string fileName, OutputWindowPane pane)
|
|
{
|
|
RunGitEx("mergeconflicts", fileName);
|
|
}
|
|
|
|
protected override CommandTarget SupportedTargets
|
|
{
|
|
get { return CommandTarget.SolutionExplorerFileItem; }
|
|
}
|
|
}
|
|
}
|