mergetools / gvimdiff2on commit Merge branch 'ab/simplify-perl-makefile' (c988f64)
   1. "$MERGE_TOOLS_DIR/vimdiff"