I also tried to look into the tabbing issue. It appears to be properly indented in the file. I guess there is some problem in diff generation.