mergetools / gvimdiff2on commit Merge branch 'wk/doc-pre-rebase' (f944ec9)
   1. "$MERGE_TOOLS_DIR/vimdiff"