| commit | 6d0b1de84df8190318f0aab93f2c393dab936b6a | [log] [tgz] |
|---|---|---|
| author | Shawn Pearce <sop@google.com> | Wed Apr 24 16:23:34 2013 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Wed Apr 24 16:23:34 2013 +0000 |
| tree | 527fdb77958a1494563c2f812c097ef09d08c035 | |
| parent | 49e2e8361e07eb3265f4120178647df369d865a1 [diff] | |
| parent | 4467d2a098bb4dca4d634967fe0f46d7d2a484f9 [diff] |
Merge "Distinguish between error and timeout in intraline diff error message" into stable-2.6