mergetools / vimdiff2on commit Merge branch 'js/colored-push-errors' (a56fb3d)
   1. "$MERGE_TOOLS_DIR/vimdiff"