| commit | 05acbe4c0a5793991842fc7eba49b3b21a32388e | [log] [tgz] |
|---|---|---|
| author | Shawn Pearce <sop@google.com> | Tue Oct 16 12:27:58 2012 -0700 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Tue Oct 16 12:27:58 2012 -0700 |
| tree | d5ff6fc585edb6b92c854a64ba334b323e272e8a | |
| parent | 7dd18f5f2c14ad470c87190c60562f5d1ad49226 [diff] | |
| parent | eb05714f884d0754a7a84156be415d84f78804ec [diff] |
Merge "Fail on LOCK_FAILURE during merge even if we plan to retry"