[rmwaite]

If you do this often enough you can create a simple commit hook that searches for these markers and will fail to commit if it finds them.