mergetools / vimdiff2on commit Merge branch 'dl/merge-cleanup-scissors-fix' (b877cb4)
   1. "$MERGE_TOOLS_DIR/vimdiff"