mergetools / gvimdiff2on commit Merge branch 'jk/push-scrub-url' (0d54ad9)
   1. "$MERGE_TOOLS_DIR/vimdiff"