mergetools / gvimdiffon commit Merge branch 'mh/split-under-lock' (6b34ce9)
   1. "$MERGE_TOOLS_DIR/vimdiff"