angular/angular.js — pull request #3128 by btford (2013-07-03 18:18:21+00:00)
Title: chore(build): add check for merge conflicts, ddescribe, and iit

FYI, the build currently fails due to [test/ng/directive/inputSpec.js](https://github.com/btford/angular.js/blob/master/test/ng/directive/inputSpec.js#L509):

```
Running "ddescribe-iit:files" (ddescribe-iit) task
>> test/ng/directive/inputSpec.js has `xit` at line 993
```