mergetools / vimdiff3on commit Merge branch 'dl/complete-cherry-pick-revert-skip' (21db12c)
   1. "$MERGE_TOOLS_DIR/vimdiff"