dwickern

# Linux
# add the following to "~/.gitconfig" file

[merge]
    tool = intellij
[mergetool "intellij"]
    cmd = /usr/local/bin/idea merge $(cd $(dirname "$LOCAL") && pwd)/$(basename "$LOCAL") $(cd $(dirname "$REMOTE") && pwd)/$(basename "$REMOTE") $(cd $(dirname "$BASE") && pwd)/$(basename "$BASE") $(cd $(dirname "$MERGED") && pwd)/$(basename "$MERGED")
    trustExitCode = true

[diff]

dwickern

import Ember from 'ember';

export default Ember.Controller.extend({
  /*openModal: function(modal, opts) {
      this.controllerFor(modal).set('model', opts);
      return this.render(modal, {
        into: 'application',
        outlet: 'modal'
      });
    },

dwickern

import Ember from 'ember';

export default Ember.Component.extend({
  imageLoaded: 'image loading',
  imageWidth: 'width loading',
  
  // purely to make sure image loads each time and
  // is not cached for testing
  volatileSrc: Ember.computed('src', function(){
    return this.get('src') + '?cache=' + new Date().toISOString();

dwickern

import Ember from 'ember';

export default Ember.Component.extend({
  imageLoaded: 'image not yet loaded',
  
  // purely to make sure image loads each time and
  // is not cached for testing
  volatileSrc: Ember.computed('src', function(){
    return this.get('src') + '?cache=' + new Date().toISOString();
  }),