Reference(s):
http://www.sourcegear.com/diffmerge/downloads.php - get the installer version, NOT the dmg version
'use strict'; | |
var gulp = require('gulp'), | |
watch = require('gulp-watch'), | |
prefixer = require('gulp-autoprefixer'), | |
uglify = require('gulp-uglify'), | |
sass = require('gulp-sass'), | |
sourcemaps = require('gulp-sourcemaps'), | |
rigger = require('gulp-rigger'), | |
cssmin = require('gulp-minify-css'), |
Reference(s):
http://www.sourcegear.com/diffmerge/downloads.php - get the installer version, NOT the dmg version
[mergetool "intellij"] | |
cmd = /Applications/WebStorm.app/Contents/MacOS/webstorm 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") \ | |
&& read -n 1 -s | |
[mergetool "vscode"] | |
cmd = code --wait $MERGED | |
[merge] |