mergetools / vimdiff3on commit Merge branch 'nd/cherry-pick-quit-fix' (39e415c)
   1. "$MERGE_TOOLS_DIR/vimdiff"