mergetools / vimdiff2on commit Merge branch 'jc/cutoff-config' (96352ef)
   1. "$MERGE_TOOLS_DIR/vimdiff"