mergetools / vimdiff3on commit Merge branch 'nd/t1509-chroot-test' into maint (36ec67d)
   1. "$MERGE_TOOLS_DIR/vimdiff"