| commit | 4ea9c8e6daaeed82e948037dc4f0f58c6d3c736d | [log] [tgz] |
|---|---|---|
| author | Michael Lumish <mlumish@google.com> | Wed Jun 24 10:55:33 2015 -0700 |
| committer | Michael Lumish <mlumish@google.com> | Wed Jun 24 10:55:33 2015 -0700 |
| tree | 9cfd3630d5716a88e4beeef14b010622933c17eb | |
| parent | d9145d91f542e838827dfdd83978586e2686973f [diff] | |
| parent | 9f903dad1493dc309e6d8aef4a065aaaee6c036b [diff] |
Merge pull request #2188 from ctiller/so-freaking-sick-of-irrelevant-merge-conflicts Make it less likely a build.json change triggers a merge conflict