mergetools / gvimdiff2on commit Merge branch 'jc/maint-pull-docfix' (6d73dba)
   1. "$MERGE_TOOLS_DIR/vimdiff"