mergetools / vimdiff2on commit Merge branch 'jk/test-trash' (ded5652)
   1. "$MERGE_TOOLS_DIR/vimdiff"