[Mageia-sysadm] Cron <root at alamut> cd /usr/share/bugzilla/template/en/custom && /usr/bin/svn update -q

[Cron Daemon]

Conflict discovered in 'bug/edit.html.tmpl'.
Select: (p) postpone, (df) diff-full, (e) edit,
        (mc) mine-conflict, (tc) theirs-conflict,
        (s) show all options: svn: Can't read stdin: End of file found