mergetools / vimdiff3on commit Merge branch 'jk/push-options-via-transport-fix' into next (a037cbf)
   1. "$MERGE_TOOLS_DIR/vimdiff"