mergetools / vimdiff3on commit completion: add --skip for cherry-pick and revert (b1b16bb)
   1. "$MERGE_TOOLS_DIR/vimdiff"