mergetools / gvimdiffon commit Merge branch 'jc/t1512-fix' (eb40e51)
   1. "$MERGE_TOOLS_DIR/vimdiff"