mergetools / gvimdiffon commit Merge branch 'wk/submodule-on-branch' (06c2768)
   1. "$MERGE_TOOLS_DIR/vimdiff"