mergetools / vimdiff2on commit Merge branch 'jc/fsck-nul-in-commit' into maint (f14acab)
   1. "$MERGE_TOOLS_DIR/vimdiff"