mergetools / gvimdiff2on commit Merge branch 'gp/document-dotfiles-in-templates-are-not-copied' (eccf97c)
   1. "$MERGE_TOOLS_DIR/vimdiff"