master
bisync: fix --conflict-loser pathname with --conflict-resolve newer
bisync: add options to auto-resolve conflicts - fixes #7471