mergetools / vimdiff2on commit Merge branch 'nb/gnome-keyring-build' into maint (1729853)
   1. "$MERGE_TOOLS_DIR/vimdiff"