mergetools / gvimdiff2on commit Merge branch 'jc/hidden-refs' (ce735bf)
   1. "$MERGE_TOOLS_DIR/vimdiff"