lars-erik

using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Microsoft.WindowsAzure.Storage;

namespace MediaToAzure
{

lars-erik

using System;
using Lucene.Net.Analysis.Snowball;
using Lucene.Net.Documents;
using Lucene.Net.Highlight;
using Lucene.Net.Index;
using Lucene.Net.Search;
using Lucene.Net.Store;
using NUnit.Framework;

namespace Lucene.Experiments.Tests

lars-erik

Title: Merge with unmodified
Command: [path to bat file]
Arguments: "%(ItemDir)" "$(ItemFilename)" "$(ItemExt)"
Initial dir: "$(ItemDir)"

Use output window
Don't prompt for args
Don't treat as unicode
Close on exit (disabled true)

lars-erik

[diff]
         tool = vsdiffmerge
         guitool = vsdiffmerge
[difftool]
         prompt = true
[difftool "vsdiffmerge"]
         cmd = \"C:/Program Files (x86)/Microsoft Visual Studio 12.0/Common7/IDE/vsdiffmerge.exe\" \"$LOCAL\" \"$REMOTE\" /t
         keepbackup = false
         trustexistcode = true

lars-erik

using System;
using System.Collections.Generic;
using System.Linq;
using Umbraco.Forms.Core;
using Umbraco.Forms.Mvc.Models;
using Umbraco.Forms.Web.Controllers;

namespace UmbForms.Extensions
{
    public class UmbracoFormsExtController : UmbracoFormsController

lars-erik

using System;
using System.Globalization;
using System.Web;
using System.Web.Mvc;
using System.Web.Routing;
using Moq;
using Umbraco.Core;
using Umbraco.Core.Configuration.UmbracoSettings;
using Umbraco.Core.Models;
using Umbraco.Core.Persistence;

lars-erik

@Component({
    selector: "list-parameters",
    templateUrl: "./list-parameters.html"
})
export class ListParametersComponent {
    @Input()
    public query: any = {};

    @Output()
    queryChange = new EventEmitter();

lars-erik

using System;
using System.Collections.Generic;
using System.Linq;
using System.Net.Http;
using System.Text;
using System.Threading.Tasks;
using System.Web.Http;
using Microsoft.Owin.Hosting;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;

lars-erik

using System;
using System.ComponentModel;
using System.Globalization;
using System.Web.Mvc;
using Microsoft.Ajax.Utilities;

namespace StringTypes.Web.Controllers
{
    public class HomeController : Controller
    {

lars-erik

using System;
using System.Collections.Generic;
using System.Linq;
using NUnit.Framework;

namespace SimpleCommands.Tests
{
    [TestFixture]
    public class When_Processing_A_Command_With_A_Composite
    {