mergetools / gvimdiff3on commit Merge branch 'dg/subtree-rebase-test' into maint (053e2fb)
   1. "$MERGE_TOOLS_DIR/vimdiff"