master
bisync: add options to auto-resolve conflicts - fixes #7471
bisync: full support for comparing checksum, size, modtime - fixes #5679 fixes #5683 fixes #5684 fixes #5675
bisync: use unique stats groups on tests