saitodisse

// Use Gists to store code you would like to remember later on
console.log(window); // log the "window" object to the console

// blabla

saitodisse

  'ruby19-postgres': {
    // Dependent systems
    depends: [],
    // More images:  http://images.azk.io
    image: "postgres:9.3",
    workdir: "/azk/#{manifest.dir}/ruby19",
    mounts: {
      '/azk/#{manifest.dir}': path("."),
      // '/var/lib/postgresql' : persistent('postgresql'), // Volume nomed
      // '/var/log/postgresql' : path('./log/postgresql'),

saitodisse

Download and install p4merge on Windows

• Download the perforce visual tool suite from here: http://www.perforce.com/perforce/downloads/index.html
• Install only p4merge

Setup p4merge as a visual mergetool

$ git config --global merge.tool p4mergetool