mergetools / gvimdiffon commit Merge branch 'mm/ls-files-s-doc' (97d9e97)
   1. "$MERGE_TOOLS_DIR/vimdiff"