mergetools / gvimdiff2on commit general improvements (43abf13)
   1. "$MERGE_TOOLS_DIR/vimdiff"