svn update Conflict discovered in 'comp/src/gb.eval.highlight/.startup'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: what to do ?