Resolve mozbuild diffs with m-c