mergetools / vimdiff2on commit builtin/push.c: use OPT_BOOL, not OPT_BOOLEAN (ab22d2e)
   1. "$MERGE_TOOLS_DIR/vimdiff"