Andrew Gregory 4838d250e5 skip conflicts resolved by file replacement ... When replacing a file with a directory, any files inside the new directory cannot possibly exist on the filesystem and can be skipped. This allows cross-package symlink-to-directory transitions when there are files with the same name under both the symlinked directory and the new directory. Signed-off-by: Andrew Gregory <andrew.gregory.8@gmail.com> Signed-off-by: Allan McRae <allan@archlinux.org>		2015-12-05 17:46:22 +10:00
..
libalpm	skip conflicts resolved by file replacement	2015-12-05 17:46:22 +10:00