Finishing up a hairy svn merge. Not thinking "this would be better in git," but instead thought "this used to suck in cvs." Getting old?