[yast-commit] [yast/yast-yast2] afc3c0: initial file conflicts support