For a lot of people, CVS is history; they’ve switched to SVN and are loving life. For those of us continuing the use this venerable tool, I present the following cobbled together bit of utility.
A client site still uses CVS, the ever trusty version control system. After what seemed a run of the mill merge I noticed this: