mergetools / gvimdiffon commit Merge branch 'jc/doc-commit-only' (0cfd333)
   1. "$MERGE_TOOLS_DIR/vimdiff"