| commit | 1c2c3c2629bee4e8328719ffd041a10bec26c3c9 | [log] [tgz] |
|---|---|---|
| author | Jeremy Stanley <fungi@yuggoth.org> | Mon Jun 15 21:23:19 2015 +0000 |
| committer | Jeremy Stanley <fungi@yuggoth.org> | Mon Jun 15 21:23:19 2015 +0000 |
| tree | b0183dc3b4004d4680284518133789690d0c1ff7 | |
| parent | 7fca9c1cc625dec94b1c06a6a65216cd1a041e85 [diff] |
Update default merge failed error to mention CRD The merge failure message is the same whether your change failed to merge or it was one of its dependencies, including cross-repo dependencies. Update the default error message for this to mention the latter possibility so that contributors don't unnecessarily rebase a dependent change which doesn't actually need it. Change-Id: Ia17d9ab2a842574cf684b4ebb955dd2ec6e9ec3d