Changes for git and hg
Added main as an exception to rule 3.2B