How can I know which are the conflicted files ?

Under $UDIR/CONF/CONF-CASE, after the update procedure, type the following command :

grep "C " update*