--skip-comments added for diff