CVS - Merge

• 9:00 Heinz: checkout (Revision A)
• 9:10 Klaus: checkout (Revision A)
• 9:20 Heinz: editiert (A$\to$H)
• 9:30 Klaus: editiert (A$\to$K)
• 9:40 Heinz: commit (H)
• 9:50 Klaus: commit

  up-to-date check failed

• 9:51 Klaus: update

  merging differences between A and H into K

• 9:52 Klaus: commit