keep conflicts after % cvs -R up -D 2014-02-05 .
resolve conflicts