conflict_resolution stringlengths 27 16k |
|---|
<<<<<<<
using System.Diagnostics;
using Microsoft.VisualStudio.TestPlatform.ObjectModel;
=======
using VsTestCase = Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase;
using ExtensionUriAttribute = Microsoft.VisualStudio.TestPlatform.ObjectModel.ExtensionUriAttribute;
>>>>>>>
using VsTestCase = Microsoft.Visua... |
<<<<<<<
using System.Linq;
=======
using System.Diagnostics.CodeAnalysis;
>>>>>>>
using System.Linq;
using System.Diagnostics.CodeAnalysis; |
<<<<<<<
this.itemsControl.SetBinding(ItemsControl.ItemsSourceProperty, new Binding { Source = this, Path = new PropertyPath("ItemsSource") });
=======
itemsControl.SetBinding(ItemsControl.ItemsSourceProperty, new Binding { Source = this, Path = new PropertyPath("ItemsSource") });
... |
<<<<<<<
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("True")]
public bool FirstRun {
get {
return ((bool)(this["First... |
<<<<<<<
using System.Threading.Tasks;
=======
using Gibbed.IO;
>>>>>>>
using System.Threading.Tasks;
using Gibbed.IO; |
<<<<<<<
this.dataGridView1 = new System.Windows.Forms.DataGridView();
=======
this.splitContainer2 = new System.Windows.Forms.SplitContainer();
this.dataGridView1 = new System.Windows.Forms.DataGridView();
this.panel1 = new System.Windows.Forms.Panel();
this... |
<<<<<<<
return CreateTheme(descriptor);
=======
return new Theme {
Author = descriptor.Author ?? String.Empty,
Description = descriptor.Description ?? String.Empty,
... |
<<<<<<<
[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (PCL)- AWS Marketplace Commerce Analytics. The AWS Marketplace Commerce Analytics service allows marketplace partners to programmatically request business intelligence data from AWS Marketplace. This service provides the same data that was pre... |
<<<<<<<
[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (PCL)- AWS IoT. AWS IoT allows you to leverage AWS to build your Internet of Things.")]
#elif DNX
[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (DNX)- AWS IoT. AWS IoT allows you to leverage AWS to build your Internet of... |
<<<<<<<
[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (PCL)- Amazon CloudSearch. Amazon CloudSearch is a managed service in the AWS Cloud that makes it simple and cost-effective to set up, manage, and scale a search solution for your website or application.")]
#elif DNX
[assembly: AssemblyDescrip... |
<<<<<<<
#line 1 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "12.0.0.0")]
=======
#line 1 "C:\Codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib... |
<<<<<<<
[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (4.5) - CodePipeline Service. CodePipeline Service")]
#elif PCL
[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (PCL)- CodePipeline Service. CodePipeline Service")]
#elif DNX
[assembly: AssemblyDescription("The Amazon Web ... |
<<<<<<<
#line 1 "C:\d\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
=======
#line 1 "D:\workspace\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
>>>>>>>
#line 1 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generator... |
<<<<<<<
protected override void OnDisplaying(MarkdownElement element, ElementDisplayingContext context) {
context.ElementShape.ProcessedContent = ToHtml(element.Content);
}
private string ToHtml(string markdown) {
return new MarkdownSharp.Markdown().Transform(markdown);
... |
<<<<<<<
public static string DownloadStringContent(Uri uri)
{
#if DNX
using (var client = new System.Net.Http.HttpClient())
{
var task = client.GetStringAsync(uri);
return task.Result;
}
#else
HttpWebRequest request = HttpWe... |
<<<<<<<
#line 1 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceClients45.tt"
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
=======
#line 1 "C:\codebase\v3\AWSDotNetPublic\generator\Servic... |
<<<<<<<
#line 1 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ExceptionClass.tt"
=======
#line 1 "C:\Codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ExceptionClass.tt"
>>>>>>>
#line 1 "C:\codebase\v3\AWSDotNetPublic\gener... |
<<<<<<<
#if PCL || DNX
=======
#if PCL|| UNITY
>>>>>>>
#if PCL|| UNITY || DNX |
<<<<<<<
#if BCL45 || DNX
/// <summary>
/// Writes the content of the ResponseStream a file indicated by the filePath argument.
/// </summary>
/// <param name="filePath">The location where to write the ResponseStream</param>
/// <param name="append">Whether or not to append to th... |
<<<<<<<
GeneratePlatformSpecificSolution(projectConfig);
=======
GeneratePlatformSpecificSolution(projectType, true);
>>>>>>>
GeneratePlatformSpecificSolution(projectConfig);
}
}
// adds any necessary projects to the collection prior to gen... |
<<<<<<<
#line 1 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\BaseServiceException.tt"
=======
#line 1 "C:\Codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\BaseServiceException.tt"
>>>>>>>
#line 1 "C:\codebase\v3\AWSDotNet... |
<<<<<<<
using Orchard.Autoroute.Models;
using Orchard.Autoroute.Services;
using Orchard.Autoroute.Settings;
using Orchard.ContentManagement;
using Orchard.ContentManagement.MetaData;
using Orchard.ContentManagement.MetaData.Models;
=======
using Orchard.ContentManagement;
using Orchard.ContentManagement.MetaData;
... |
<<<<<<<
[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (PCL)- Amazon Simple Email Service. Amazon SES is an outbound-only email-sending service that provides an easy, cost-effective way for you to send email.")]
#elif DNX
[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (DNX)- ... |
<<<<<<<
using System.Threading.Tasks;
=======
using System.Reflection;
>>>>>>>
using System.Threading.Tasks;
using System.Reflection; |
<<<<<<<
public UnityRequest(Uri requestUri)
{
=======
public UnityWebRequest(Uri requestUri)
{
>>>>>>>
public UnityRequest(Uri requestUri)
{
<<<<<<<
{
foreach (var header in headers)
=======
{
foreach (var item in headers)
>>>... |
<<<<<<<
#line 1 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "12.0.0.0")]
=======
#line 1 "C:\d\cc\unitywebrequest\generator\ServiceClientGeneratorLib\Genera... |
<<<<<<<
using System.Linq;
using System.Web.Mvc;
using JetBrains.Annotations;
=======
using System.Web.Mvc;
>>>>>>>
using System.Linq;
using System.Web.Mvc;
<<<<<<<
protected virtual ISite CurrentSite { get; [UsedImplicitly] private set; }
public ActionResult Index(Pager pager, string q = "") {
... |
<<<<<<<
// This code was generated by a tool.
// Runtime Version: 16.0.0.0
//
=======
// This code was generated by JetBrains T4 Processor
>>>>>>>
// This code was generated by a tool.
// Runtime Version: 16.0.0.0
//
<<<<<<<
#line 1 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceCl... |
<<<<<<<
=======
using Orchard.Localization.Services;
using Orchard.Search.Models;
>>>>>>>
using Orchard.Localization.Services; |
<<<<<<<
// This code was generated by a tool.
// Runtime Version: 16.0.0.0
//
=======
// This code was generated by JetBrains T4 Processor
>>>>>>>
// This code was generated by a tool.
// Runtime Version: 16.0.0.0
//
<<<<<<<
#line 1 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceCl... |
<<<<<<<
private readonly ICultureManager _cultureManager;
private readonly IHttpContextAccessor _httpContextAccessor;
=======
private readonly IAliasStorage _aliasStorage;
>>>>>>>
private readonly ICultureManager _cultureManager;
private readonly IAliasStorage _aliasStorage;
... |
<<<<<<<
namespace Orchard.Environment {
=======
namespace Orchard.Environment {
>>>>>>>
namespace Orchard.Environment {
<<<<<<<
}
}
=======
void ResetSiteCompilation();
}
}
>>>>>>>
} |
<<<<<<<
=======
using Orchard.Users.Drivers;
using Orchard.Users.Events;
>>>>>>>
using Orchard.Users.Events;
<<<<<<<
return _contentManager.Create<UserPart>("User", init =>
{
init.Record.UserName = createUserParams.Username;
init.Record.Email = createUserParam... |
<<<<<<<
public const string GenerateUnmarshallerKey = "generateUnmarshaller";
=======
public const string ExamplesKey = "examples";
>>>>>>>
public const string ExamplesKey = "examples";
public const string GenerateUnmarshallerKey = "generateUnmarshaller"; |
<<<<<<<
if (Options.Clean && !Configuration.IsChildConfig)
=======
this.FilesWrittenToGeneratorFolder.Clear();
if (Options.Clean && this.Configuration.ParentConfig == null)
>>>>>>>
this.FilesWrittenToGeneratorFolder.Clear();
if (Options.Clean && !Configur... |
<<<<<<<
#line 1 "C:\git-repros\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
=======
#line 1 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
>>>>>>>
#line 1 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Ge... |
<<<<<<<
// This code was generated by a tool.
// Runtime Version: 16.0.0.0
//
=======
// This code was generated by JetBrains T4 Processor
>>>>>>>
// This code was generated by a tool.
// Runtime Version: 16.0.0.0
//
<<<<<<<
#line 1 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceCl... |
<<<<<<<
[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (PCL)- Amazon Cognito Identity. Amazon Cognito is a service that makes it easy to save user data, such as app preferences or game state, in the AWS Cloud without writing any backend code or managing any infrastructure. With Amazon Cognito, you... |
<<<<<<<
// This code was generated by a tool.
// Runtime Version: 16.0.0.0
//
=======
// This code was generated by JetBrains T4 Processor
>>>>>>>
// This code was generated by a tool.
// Runtime Version: 16.0.0.0
//
<<<<<<<
#line 1 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceCl... |
<<<<<<<
#if !PCL && !DNX
=======
#if !PCL && !UNITY
>>>>>>>
#if !PCL && !UNITY && !DNX
<<<<<<<
#if !PCL && !DNX
=======
#if !PCL && !UNITY
>>>>>>>
#if !PCL && !UNITY && !DNX |
<<<<<<<
#if PCL || DNX
=======
#if PCL ||UNITY
>>>>>>>
#if PCL || UNITY || DNX
<<<<<<<
#if PCL || DNX
=======
#if PCL || UNITY
>>>>>>>
#if PCL || UNITY || DNX |
<<<<<<<
[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (PCL)- AWS Directory Service. AWS Directory Service is a managed service that allows you to connect your AWS resources with an existing on-premises Microsoft Active Directory or to set up a new, stand-alone directory in the AWS Cloud.")]
#elif... |
<<<<<<<
[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (4.5) - AWS Transfer for SFTP. AWS Transfer for SFTP is a fully managed service that enables transfer of secure data over the internet into and out of Amazon S3. SFTP is deeply embedded in data exchange workflows across different industries su... |
<<<<<<<
[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (PCL)- Amazon Route 53 Domains. Amazon Route 53 is a highly available and scalable cloud Domain Name System (DNS) web service.")]
#elif DNX
[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (DNX)- Amazon Route 53 Domains. Am... |
<<<<<<<
#line 33 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
=======
#line 42 "C:\a\merged\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
>>>>>>>
#line 42 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGe... |
<<<<<<<
[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (PCL)- AWS Direct Connect. AWS Direct Connect makes it easy to establish a dedicated network connection from your premises to AWS. Using AWS Direct Connect, you can establish private connectivity between AWS and your datacenter, office, or col... |
<<<<<<<
[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (4.5) - AWS CodeCommit. AWS CodeCommit")]
#elif PCL
[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (PCL)- AWS CodeCommit. AWS CodeCommit")]
#elif DNX
[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (D... |
<<<<<<<
if (_instance == null)
{
_instance = new DefaultInstanceProfileAWSCredentials();
// force a fetch of credentials the very first time & schedule a timer task.
_instance.RenewCreden... |
<<<<<<<
public class ExamplesOperationFilter : IOperationFilter
{
private static IServiceProvider _services;
public ExamplesOperationFilter(IServiceProvider services = null)
{
_services = services;
}
public void Apply(Operation operation, OperationFilterContext context)
{
SetRequestModelExamples(o... |
<<<<<<<
//var s = GenerateSourceXML();
if (plcBlock is FB)
=======
var s = Export(ExportFormat.Xml);
if (s.Contains("<Type>FB</Type>"))
>>>>>>>
if (plcBlock is FB) |
<<<<<<<
public int alarmQueryAlarm_S(byte[] buffer, int length, ref int alarmCount)
{
throw new NotImplementedException();
}
=======
public int daveReadPLCTime(out DateTime dateTime)
{
throw new NotImplementedException();
}
>>>>>>>
pu... |
<<<<<<<
void WriteMultipleStreamsInParallel()
{
Enumerable.Range(1, 50).AsParallel()
.ForAll(streamIndex =>
{
var stream = new Stream(string.Concat(Partition, "-", streamIndex));
Console.WriteLine("Writing to new stream ... |
<<<<<<<
private void aboutToolStripMenuItem_Click(object sender, EventArgs e)
{
FormAbout about = new FormAbout(CurrentVersion);
about.ShowDialog();
}
=======
private void WarpWorldSettingsToolStripMenuItem_Click(object sender, EventArgs e)
{
... |
<<<<<<<
this.toolStripMenuItem2 = new System.Windows.Forms.ToolStripMenuItem();
this.aboutToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
=======
this.warpWorldSettingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
>>>>>>>
this.tool... |
<<<<<<<
[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (4.5) - Amazon DynamoDB Streams. Amazon DynamoDB Streams")]
#elif (WIN_RT && WINDOWS_PHONE)
[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (Portable)- Amazon DynamoDB Streams. Amazon DynamoDB Streams")]
#elif WIN_RT
[asse... |
<<<<<<<
using NAudio.Wave;
using DSharpPlus.Interactivity;
=======
//using NAudio.Wave;
>>>>>>>
//using NAudio.Wave;
using DSharpPlus.Interactivity; |
<<<<<<<
var siteContext = generator.BuildContext(@"C:\TestSite", @"C:\TestSite\_site", false);
=======
var siteContext = generator.BuildContext(@"C:\TestSite", false);
>>>>>>>
var siteContext = generator.BuildContext(@"C:\TestSite", @"C:\TestSite\_site", false);
<<<<<<<
... |
<<<<<<<
public Recipe(IFileSystem fileSystem, string engine, string directory, IEnumerable<IAdditionalIngredient> additionalIngredients)
=======
public Recipe(IFileSystem fileSystem, string engine, string directory, bool withProject)
>>>>>>>
public Recipe(IFileSystem fileSystem, string engine... |
<<<<<<<
private const string PageContents = "---\r\ntest: value\r\n---#{{ page.title }}\r\n{% include foobar.html %}";
private const string IncludePageContents = "foo {{ page.test }} bar";
private const string ExpectedfileContents = "<h1>My Web Site</h1><p>foo value bar</p>";
======... |
<<<<<<<
private readonly IFileSystem _fileSystem;
private IEnumerable<FileInfo> _files;
private string _outputPath;
=======
private readonly static Regex IMPORT_PATTERN = new Regex(@"@import +url\(([""']){0,1}(.*?)\1{0,1}\);", RegexOptions.Compiled | RegexOptions.IgnoreCase);
... |
<<<<<<<
public class Given_Page_And_Posts_Have_Custom_Metadatas : BakingEnvironment<LiquidEngine>
{
const string Page1Contents = "---\r\n title: index\r\n show: true \r\n---\r\n\r\n{% for post in site.posts %}\r\n{{ post.title }}/{{ post.show }}-\r\n{% endfor %}";
const string E... |
<<<<<<<
public BasicAuthPage GoToBasicAuthPage()
{
this.Driver.GetElement(this.linkLocator.Evaluate("basic_auth")).Click();
return new BasicAuthPage(this.DriverContext);
}
=======
public MultipleWindowsPage GoToMultipleWindowsPage()
{
this.... |
<<<<<<<
if (!(dependencyObject is MultiSelectComboBox control))
return;
=======
if (!(dependencyObject is MultiSelectComboBox control))
{
return;
}
if (control.MultiSelectComboBoxGrid == null)
{
... |
<<<<<<<
/// <para>Defines that the client should attempt to reconnect indefinitely.</para>
/// <para>This is typically a very bad idea to set to <c>true</c>, as it will swallow all connection errors.</para>
/// <para>Defaults to false.</para>
/// </summary>
public bool ReconnectI... |
<<<<<<<
if (MessageBox.Show(this,
"The command to run git is not configured correct." + Environment.NewLine +
"You need to set the correct path to be able to use GitExtensions." + Environment.NewLine +
Environment.NewLine + "Do you ... |
<<<<<<<
_backgroundLoader.LoadAsync(() => _getCandidates(_selectedText), SearchForCandidates);
=======
_backgroundLoader.Load(() => _getCandidates(selectedText), SearchForCandidates);
>>>>>>>
_backgroundLoader.LoadAsync(() => _getCandidates(selectedText), SearchForCandidates); |
<<<<<<<
using (var frm = new FormProcess(GitCommandHelpers.CherryPickCmd(Revision.Guid, AutoCommit.Checked, string.Join(" ", argumentsList.ToArray())))) frm.ShowDialog(this);
MergeConflictHandler.HandleMergeConflicts(this);
=======
new FormProcess(GitCommandHelpers.Cher... |
<<<<<<<
if (files.Length > 0)
using (Process process1 = gitCommand.CmdStartProcess(AppSettings.GitCommand, amCommand))
=======
if (files.Length == 0)
return "";
var output = "";
using (Process process1 = gitComman... |
<<<<<<<
// settingsToolStripMenuItem1
//
this.settingsToolStripMenuItem1.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.gitMaintenanceToolStripMenuItem,
this.toolStripSeparator4,
this.editgitignoreToolStripMenuItem1,
... |
<<<<<<<
private void SplitButtonMenuItem_Click(object sender, EventArgs e)
{
//reset bold item to regular
ToolStripMenuItem item = (ToolStripMenuItem)contextMenuStrip_SplitButton.Items.OfType<ToolStripMenuItem>().First(s => s.Font.Bold == true);
item.Font = new Font(... |
<<<<<<<
new FormProcess("checkout \"" + GetRevision(LastRow).Guid + "\"");
=======
new FormProcess("checkout \"" + RevisionList[LastRow].Guid + "\"").ShowDialog();
>>>>>>>
new FormProcess("checkout \"" + GetRevision(LastRow).Guid + "\"").ShowDialog(); |
<<<<<<<
private void fileHistoryDiffToolstripMenuItem_Click(object sender, EventArgs e)
{
GitItemStatus item = DiffFiles.SelectedItem;
if (item.IsTracked)
GitUICommands.Instance.StartFileHistoryDialog(item.Name);
}
=======
private vo... |
<<<<<<<
commitAuthorStatus.ToolTipText = _commitCommitterToolTip.Text;
=======
toolAuthor.Control.PreviewKeyDown += ToolAuthor_PreviewKeyDown;
}
void ToolAuthor_PreviewKeyDown(object sender, PreviewKeyDownEventArgs e)
{
if (e.Alt)
e.IsInputK... |
<<<<<<<
private GitCommandsInstance gitGetGraphCommand;
private Thread backgroundThread;
private volatile bool abortThread = false;
=======
>>>>>>>
<<<<<<<
if (backgroundThread != null)
{
abortThread = true;
Thread.Sleep(50);
... |
<<<<<<<
Volatile.Write(ref this._wsPing, tdelta);
this.Discord.Logger.LogDebug(VoiceNextEvents.VoiceKeepalive, "Received UDP keepalive {0} (ping {1}ms)", keepalive, tdelta);
=======
Volatile.Write(ref this._udpPing, tdelta);
this.Discord.DebugLogger.LogM... |
<<<<<<<
this.editbuildserverToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
=======
this.BuildReportTabPage = new System.Windows.Forms.TabPage();
this.BuildReportWebBrowser = new System.Windows.Forms.WebBrowser();
>>>>>>>
this.BuildReportTabPage = new... |
<<<<<<<
CommitData data;
if (_revision != null)
{
data = CommitData.CreateFromRevision(_revision);
CommitData.UpdateCommitMessage(data, Module, _revisionGuid, ref error);
_revision.Body = data.Body;
ThreadPool.QueueUserW... |
<<<<<<<
using Settings = GitCommands.AppSettings;
using GitUI.HelperDialogs;
=======
using Settings = GitCommands.Settings;
>>>>>>>
using Settings = GitCommands.AppSettings; |
<<<<<<<
if (changes == Settings.LocalChanges.Stash && Module.IsDirtyDir())
UICommands.Stash(_owner);
=======
//Stash local changes, but only if the setting CheckForUncommittedChangesInCheckoutBranch is true
if (Settings.CheckForUncommittedChangesInCheckoutBranch &&
... |
<<<<<<<
diffViewer.ViewChangesAsync(RevisionGrid.GetSelectedRevisions(), DiffFiles.SelectedItem, String.Empty);
=======
diffViewer.ViewChanges(RevisionGrid.GetSelectedRevisions(), DiffFiles.SelectedItem, string.Empty);
>>>>>>>
diffViewer.ViewChangesAsync(RevisionGrid.GetSelectedRe... |
<<<<<<<
private CookieContainer GetTeamCityNtlmAuthCookie (string serverUrl)
{
string url = serverUrl + "ntlmLogin.html";
var cookieContainer = new CookieContainer();
var request = (HttpWebRequest)HttpWebRequest.Create (url);
request.CookieContainer = cook... |
<<<<<<<
_task.LoadAsync(() => GetBranches(branchType), (branches) => { Branches.Add(branchType, branches); DisplayBranchDatas(); });
=======
_task.Load(() => GetBranches(branchType), branches =>
{
Branches.Add(branchType, branches);
... |
<<<<<<<
remote = newString;
newString = module.GetSetting(string.Format(SettingKeyString.RemoteUrl, remote));
url = module.GetSetting(string.Format(SettingKeyString.RemoteUrl, remote));
newString = GetRemotePath(url);
=====... |
<<<<<<<
if (IsDisposed)
{
return;
}
=======
if (_customUnderlines.IsImeStartingComposition)
return;
>>>>>>>
if (IsDisposed)
{
return;
}
if (_customUnderlines.IsImeStartin... |
<<<<<<<
// localToolStripMenuItem
//
this.localToolStripMenuItem.Checked = true;
this.localToolStripMenuItem.CheckOnClick = true;
this.localToolStripMenuItem.CheckState = System.Windows.Forms.CheckState.Checked;
this.localToolStripMenuItem.Name = ... |
<<<<<<<
GitUICommands.Instance.Stash(this);
stashed = true;
=======
new FormProcess("stash save").ShowDialog(this);
return true;
>>>>>>>
GitUICommands.Instance.Stash(this);
return true;
<<<<<<<
if (stashe... |
<<<<<<<
url = data[1];
var result = new Uri(url);
if (result.Scheme == "gitext")
=======
>>>>>>> |
<<<<<<<
=======
this.chkConsoleEmulator = new System.Windows.Forms.CheckBox();
this.tooltip = new System.Windows.Forms.ToolTip(this.components);
>>>>>>>
this.chkRememberIgnoreWhiteSpacePreference = new System.Windows.Forms.CheckBox();
this.chkConsoleEmulator = new Syst... |
<<<<<<<
private static ProcessStartInfo CreateStartInfo(string command, string arguments, string workingDir, Encoding encoding = null)
{
return new ProcessStartInfo
{
UseShellExecute = false,
ErrorDialog = false,
CreateNoWindow = tr... |
<<<<<<<
=======
Remote = remote;
>>>>>>>
Remote = remote;
<<<<<<<
ParseName();
=======
>>>>>>>
ParseName(); |
<<<<<<<
String s = new GitModule("").RunGitCmd(arguments, Encoding.UTF8);
=======
int exitCode;
String s = new GitModule("").RunGitCmd(arguments, out exitCode, Encoding.UTF8);
>>>>>>>
String s = new GitModule("").RunGitCmd(arguments, En... |
<<<<<<<
=======
//Administrator / Everything (FIX ME)
Administrator = 8,
>>>>>>>
//Administrator / Everything
Administrator = 8, |
<<<<<<<
this.workingToolStripMenuItem.Size = new System.Drawing.Size(174, 23);
=======
this.workingToolStripMenuItem.Size = new System.Drawing.Size(133, 20);
>>>>>>>
this.workingToolStripMenuItem.Size = new System.Drawing.Size(133, 20);
<<<<<<<
this.showIgnoredFilesTo... |
<<<<<<<
this._NO_TRANSLATE_filesWillBeIgnored.Location = new System.Drawing.Point(449, 211);
this._NO_TRANSLATE_filesWillBeIgnored.Name = "_NO_TRANSLATE_filesWillBeIgnored";
this._NO_TRANSLATE_filesWillBeIgnored.Size = new System.Drawing.Size(0, 12);
=======
this._NO_TR... |
<<<<<<<
this.Revisions.TabIndex = 0;
=======
this.Revisions.Scroll += new System.Windows.Forms.ScrollEventHandler(this.Revisions_Scroll);
>>>>>>>
<<<<<<<
=======
this.Revisions.CellContextMenuStripChanged += new System.Windows.Forms.DataGridViewCellEventHandler(this.Revisions_C... |
<<<<<<<
InitializeComponent();
=======
InitializeComponent(); Translate();
Revisions.Columns[0].Width = 40;
>>>>>>>
InitializeComponent(); Translate(); |
<<<<<<<
using System.Collections.Generic;
namespace GitUIPluginInterfaces
{
public interface IGitModule
{
IEnumerable<IGitSubmodule> GetSubmodules();
string RunGit(string arguments);
string RunGit(string arguments, out int exitCode);
string RunBatchFile(string batchFile);
... |
<<<<<<<
[JsonConverter(typeof(OptionalJsonConverter))]
public struct Optional<T> : IEquatable<Optional<T>>, IEquatable<T>
=======
public readonly struct Optional<T> : IEquatable<Optional<T>>, IEquatable<T>
>>>>>>>
[JsonConverter(typeof(OptionalJsonConverter))]
public readonly struct Optional<T> :... |
<<<<<<<
if (!Settings.Module.IsBareRepository()) return;
MessageBox.Show(noWorkingDir.Text);
=======
if (!Settings.IsBareRepository()) return;
MessageBox.Show(noWorkingDir.Text, _noWorkingDirCaption.Text);
>>>>>>>
if (!Settings.Module.IsBareRepository()) re... |
<<<<<<<
this.tableLayoutPanel3.SetRowSpan(this.panelCurrentSettingsPage, 2);
this.panelCurrentSettingsPage.Size = new System.Drawing.Size(724, 554);
=======
this.panelCurrentSettingsPage.Size = new System.Drawing.Size(724, 557);
>>>>>>>
this.tableLayoutPanel3.SetRowSpa... |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.