odytrice

P4Merge Windows Configuration

Setting up p4merge as diff and merge tool on Windows. Tried for Git version 1.8.4.msysgit.0.

Two alternatives are explained: using the command line, and directly editing the config file.

Setting up from the command line

Being the installation path "C:Program Files\Perforce\p4merge.exe", just run:

odytrice

public class AuthorizeUserAttribute: AuthorizeAttribute
{
    private string[] _permissions;
    private IUserManager _user;
    public AuthorizeUserAttribute(params string[] permissions)
    {
        _permissions = permissions;
        _user = NinjectContainer.Resolve<IUserManager>();
    }
    protected override bool AuthorizeCore(HttpContextBase httpContext)

odytrice

namespace Application.Tests
{
    [TestClass]
    public class BindingsTest
    {
        [TestMethod]
        public void TestBindings()
        {
            //Create Kernel and Load Assembly Application.Web

odytrice

seq {
    for i in 1..10 do
    for j in 10..15 do
    yield i * j
}

odytrice

namespace FluentMigrator.Extensions 

open FluentMigrator.Expressions
open FluentMigrator.Infrastructure
open System
open System.Collections.Generic
open System.Linq
open FluentMigrator
open FluentMigrator.Model
open System.Data

odytrice

    public class DataRepository : IDataRepository
    {
        private DbContext _dbContext;

        public DataRepository(DbContext context)
        {
            _dbContext = context;
        }

        public IQueryable<T> Query<T>() where T : class

odytrice

namespace MyAPI.Migrations

open System
open System.Collections.Generic
open Microsoft.EntityFrameworkCore
open Microsoft.EntityFrameworkCore.Migrations
open Microsoft.EntityFrameworkCore.Metadata
open Microsoft.EntityFrameworkCore.Infrastructure
open Microsoft.EntityFrameworkCore.Migrations.Operations
open Microsoft.EntityFrameworkCore.Migrations.Operations.Builders

odytrice

//External state
let z = 5;

//this closure implicitly contains the value of z
let closure = function(x){
  return x + z;
} 

//The above loosely translates to..
class ObjectClosure{

odytrice

module App {
        export class PagedList<T>{
        private page: number;
        private list: IList<T>;
        private items: T[];
        private itemsPerPage: number;
        private numOfPages: number;
        private count: number;

        constructor(list: IList<T>, itemsPerPage = 10) {

odytrice

module App.Directives {
    var Directive = function (): ng.IDirective {
        return {
            restrict: "A",
            scope: {
                location: "@navigate"
            },
            link: function (scope: any, el, attrs) {
                el.click(function () {
                    document.location.href = scope.location;