mergetools / gvimdiffon commit Merge branch 'bw/submodule-branch-dot-doc' into maint (c838696)
   1. "$MERGE_TOOLS_DIR/vimdiff"